Merge pull request #22 from camptocamp/fix-worker-build

Fix worker serialization in build script

build/generate-dist.js

@@ -20,9 +20,11 @@ async function serializeWorker(entryPath) {
   const bundle = await rollup({
     input: entryPath,
     plugins,
+  });
+  const { output } = await bundle.generate({
+    format: 'es',
     inlineDynamicImports: true,
   });
-  const { output } = await bundle.generate({ format: 'es' });
 
   if (output.length !== 1) {
     throw new Error(`Unexpected output length: ${output.length}`);
@@ -42,7 +44,9 @@ async function serializeAllWorkersInCode(fileName, code) {
     srcRoot,
     path.relative(distRoot, path.dirname(fileName))
   );
-  const workerMatches = codeResult.matchAll(/new Worker\('([^']+)'/g);
+  const workerMatches = codeResult.matchAll(
+    /new Worker\(new URL\('(.+)', import\.meta\.url\)/g
+  );
   for (const match of workerMatches) {
     const workerPath = path.join(dir, match[1]);
     console.log(
@@ -53,7 +57,7 @@ async function serializeAllWorkersInCode(fileName, code) {
     );
     const workerCode = await serializeWorker(workerPath);
     codeResult = codeResult.replace(
-      `new Worker('${match[1]}'`,
+      `new Worker(new URL('${match[1]}', import.meta.url)`,
       `new Worker(URL.createObjectURL(new Blob([${JSON.stringify(
         workerCode
       )}], {type: 'application/javascript'}))`
@@ -104,16 +108,16 @@ async function main() {
       }),
       typescript(),
     ],
-    inlineDynamicImports: true,
   });
   await nodeBundle.write({
     file: path.join(distRoot, './dist-node.js'),
     format: 'cjs',
+    inlineDynamicImports: true,
   });
 
   console.log(
     `
-> files successfully build in ${distRoot} folder.`
+> files successfully built in ${distRoot} folder.`
   );
 }
 

src/ogc-api/endpoint.ts

@@ -158,6 +158,6 @@ export default class OgcApiEndpoint {
         url.pathname += `/${itemId}`;
         return url.toString();
       })
-      .then(fetchDocument);
+      .then(fetchDocument<OgcApiCollectionItem>);
   }
 }

src/ogc-api/link-utils.ts

@@ -2,15 +2,17 @@ import { OgcApiDocument } from './model';
 import { EndpointError } from '../shared/errors';
 import { getFetchOptions } from '../shared/http-utils';
 
-export function fetchDocument(url: string): Promise<OgcApiDocument> {
+export function fetchDocument<T extends OgcApiDocument>(
+  url: string
+): Promise<T> {
   const urlObj = new URL(url, window.location.toString());
   urlObj.searchParams.set('f', 'json');
   const options = getFetchOptions();
   const optionsHeaders = 'headers' in options ? options.headers : {};
   return fetch(urlObj.toString(), {
     ...options,
     headers: { ...optionsHeaders, Accept: 'application/json' },
-  }).then((resp) => resp.json());
+  }).then((resp) => resp.json() as Promise<T>);
 }
 
 export function fetchRoot(url: string) {

src/ogc-api/model.ts

@@ -1,4 +1,4 @@
-import { Feature } from 'geojson';
+import { Feature, Geometry } from 'geojson';
 import { BoundingBox, CrsCode } from '../shared/models';
 
 export type ConformanceClass = string;
@@ -54,8 +54,6 @@ export interface OgcApiCollectionInfo {
   sortables: CollectionParameter[];
 }
 
-export type OgcApiCollectionItem = Feature | unknown;
-
 export interface OgcApiDocumentLinks {
   rel: string;
   type: string;
@@ -84,28 +82,42 @@ interface OgcApiRecordTheme {
   concepts: OgcApiRecordThemeConcept[];
   scheme: string;
 }
+interface OgcApiTime {
+  date?: string;
+  timestamp?: string;
+  interval?: [string, string];
+  resolution?: string;
+}
 export interface OgcApiRecordContact {
   name: string;
   links: OgcApiDocumentLinks[];
   contactInstructions: string;
   roles: string[];
 }
 export interface OgcApiRecordProperties {
-  recordCreated: Date;
-  recordUpdated: Date;
-  providers: string[];
   type: string;
   title: string;
-  description: string;
-  externalId: OgcApiItemExternalId[];
-  themes: OgcApiRecordTheme[];
-  keywords: string[];
-  language: string;
-  contacts: OgcApiRecordContact[];
-  formats: string[];
-  license: string;
+  recordCreated?: Date;
+  recordUpdated?: Date;
+  providers?: string[];
+  description?: string;
+  externalId?: OgcApiItemExternalId[];
+  themes?: OgcApiRecordTheme[];
+  keywords?: string[];
+  language?: string;
+  contacts?: OgcApiRecordContact[];
+  formats?: string[];
+  license?: string;
 }
 
-export type OgcRecord = Feature<OgcApiRecordProperties> & {
+export type OgcApiRecord = {
+  id: string;
+  type: string;
+  time: OgcApiTime;
+  geometry: Geometry;
+  properties: OgcApiRecordProperties;
   links: OgcApiDocumentLinks[];
+  conformsTo?: string[];
 };
+
+export type OgcApiCollectionItem = OgcApiRecord;