paralayer 1.8.0 → 1.10.0

package/dist/bin.js

@@ -32,8 +32,6 @@ var Paralayer = class extends Unit {
     await this.ready$.promise;
     await this.queue.run(() => this.build());
     if (!this.options.watch) await this.watcher.close();
-  }
-  async readSetupJs() {
     const setupJsPath = join(this.options.output, "setup.js");
     return await readFile(setupJsPath, "utf-8");
   }
@@ -133,7 +131,7 @@ var Paralayer = class extends Unit {
     }
     const globals = [
       `declare global {`,
-      `  var ${layerName}: ${LayerName}`,
+      `  const ${layerName}: ${LayerName}`,
       ``,
       `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map((name) => `    ${name}: typeof ${name}`),
@@ -155,6 +153,9 @@ var Paralayer = class extends Unit {
       if (layer1.length !== layer2.length) return layer2.length - layer1.length;
       return layer1.localeCompare(layer2);
     }).map((layer) => `import './layer.${layer}.ts'`);
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`);
+    }
     return [...imports].join("\n");
   }
   generateSetupContent(allLayers) {
@@ -197,9 +198,8 @@ var Paralayer = class extends Unit {
   }
 };
 async function paralayer(options) {
-  const pl = new Paralayer(options);
-  await pl.start();
-  return await pl.readSetupJs();
+  const setupLayersJs = await new Paralayer(options).start();
+  return setupLayersJs;
 }
 
 // src/bin.ts

package/dist/paralayer.d.ts

@@ -13,7 +13,7 @@ type Options = {
     globalize?: boolean;
     /** If provided, other layers will extend this layer. */
     globalLayerName?: string | null;
-    /** If a file name does not have layer tags, default layer name will be used. */
+    /** If a file name does not have any layer tags, default layer name will be used. */
     defaultLayerName?: string | null;
 };
 declare class Paralayer extends Unit {
@@ -27,8 +27,7 @@ declare class Paralayer extends Unit {
     private previousLayers;
     private watcher;
     constructor(options: Options);
-    start(): Promise<void>;
-    readSetupJs(): Promise<string>;
+    start(): Promise<string | undefined>;
     private onAll;
     private onReady;
     private build;
@@ -43,6 +42,6 @@ declare class Paralayer extends Unit {
     private isTopLayer;
     private write;
 }
-declare function paralayer(options: Options): Promise<string>;
+declare function paralayer(options: Options): Promise<string | undefined>;
 
 export { type DirPath, type File, type Options, Paralayer, paralayer as default, paralayer };

package/dist/paralayer.js

@@ -27,8 +27,6 @@ var Paralayer = class extends Unit {
     await this.ready$.promise;
     await this.queue.run(() => this.build());
     if (!this.options.watch) await this.watcher.close();
-  }
-  async readSetupJs() {
     const setupJsPath = join(this.options.output, "setup.js");
     return await readFile(setupJsPath, "utf-8");
   }
@@ -128,7 +126,7 @@ var Paralayer = class extends Unit {
     }
     const globals = [
       `declare global {`,
-      `  var ${layerName}: ${LayerName}`,
+      `  const ${layerName}: ${LayerName}`,
       ``,
       `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map((name) => `    ${name}: typeof ${name}`),
@@ -150,6 +148,9 @@ var Paralayer = class extends Unit {
       if (layer1.length !== layer2.length) return layer2.length - layer1.length;
       return layer1.localeCompare(layer2);
     }).map((layer) => `import './layer.${layer}.ts'`);
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`);
+    }
     return [...imports].join("\n");
   }
   generateSetupContent(allLayers) {
@@ -192,9 +193,8 @@ var Paralayer = class extends Unit {
   }
 };
 async function paralayer(options) {
-  const pl = new Paralayer(options);
-  await pl.start();
-  return await pl.readSetupJs();
+  const setupLayersJs = await new Paralayer(options).start();
+  return setupLayersJs;
 }
 var paralayer_default = paralayer;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paralayer",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -23,6 +23,9 @@
       "source": "./src/paralayer.ts",
       "import": "./dist/paralayer.js",
       "types": "./dist/paralayer.d.ts"
+    },
+    "./ts": {
+      "import": "./src/paralayer.ts"
     }
   },
   "files": [
@@ -30,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.9.0",
+    "@eposlabs/utils": "^1.10.0",
     "chokidar": "^4.0.3",
     "minimist": "^1.2.8"
   },

package/src/paralayer.ts

@@ -19,7 +19,7 @@ export type Options = {
   globalize?: boolean
   /** If provided, other layers will extend this layer. */
   globalLayerName?: string | null
-  /** If a file name does not have layer tags, default layer name will be used. */
+  /** If a file name does not have any layer tags, default layer name will be used. */
   defaultLayerName?: string | null
 }
 
@@ -52,9 +52,8 @@ export class Paralayer extends Unit {
     await this.ready$.promise
     await this.queue.run(() => this.build())
     if (!this.options.watch) await this.watcher.close()
-  }
 
-  async readSetupJs() {
+    // Return content of setup.js
     const setupJsPath = join(this.options.output, 'setup.js')
     return await readFile(setupJsPath, 'utf-8')
   }
@@ -201,7 +200,7 @@ export class Paralayer extends Unit {
 
     const globals = [
       `declare global {`,
-      `  var ${layerName}: ${LayerName}`,
+      `  const ${layerName}: ${LayerName}`,
       ``,
       `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map(name => `    ${name}: typeof ${name}`),
@@ -229,6 +228,10 @@ export class Paralayer extends Unit {
       })
       .map(layer => `import './layer.${layer}.ts'`)
 
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`)
+    }
+
     return [...imports].join('\n')
   }
 
@@ -281,9 +284,8 @@ export class Paralayer extends Unit {
 }
 
 export async function paralayer(options: Options) {
-  const pl = new Paralayer(options)
-  await pl.start()
-  return await pl.readSetupJs()
+  const setupLayersJs = await new Paralayer(options).start()
+  return setupLayersJs
 }
 
 export default paralayer