paralayer 1.9.0 → 1.11.0

package/dist/bin.js

@@ -4,8 +4,8 @@
 import minimist from "minimist";
 
 // src/paralayer.ts
-import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
+import { Queue, Unit, safe } from "dropcap/utils";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
 var Paralayer = class extends Unit {
@@ -30,10 +30,8 @@ var Paralayer = class extends Unit {
     this.watcher.on("all", this.onAll);
     this.watcher.on("ready", this.onReady);
     await this.ready$.promise;
-    await this.queue.run(() => this.build());
+    await this.queue.add(() => 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");
   }
@@ -51,11 +49,11 @@ var Paralayer = class extends Unit {
     }
     if (event === "unlink") {
       delete this.files[path];
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
     if (event === "add" || event === "change") {
       this.files[path] = null;
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
   };
   onReady = async () => {
@@ -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}`),
@@ -182,7 +180,7 @@ var Paralayer = class extends Unit {
     const LayerName = layer.split(".").map(this.capitalize).join("");
     if (style === "camel") return this.decapitalize(LayerName);
     if (style === "Pascal") return LayerName;
-    throw this.never;
+    throw this.never();
   }
   capitalize(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -200,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

@@ -1,4 +1,4 @@
-import { Unit } from '@eposlabs/utils';
+import { Unit } from 'dropcap/utils';
 
 type DirPath = string;
 type File = {
@@ -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

@@ -1,6 +1,6 @@
 // src/paralayer.ts
-import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
+import { Queue, Unit, safe } from "dropcap/utils";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
 var Paralayer = class extends Unit {
@@ -25,10 +25,8 @@ var Paralayer = class extends Unit {
     this.watcher.on("all", this.onAll);
     this.watcher.on("ready", this.onReady);
     await this.ready$.promise;
-    await this.queue.run(() => this.build());
+    await this.queue.add(() => 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");
   }
@@ -46,11 +44,11 @@ var Paralayer = class extends Unit {
     }
     if (event === "unlink") {
       delete this.files[path];
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
     if (event === "add" || event === "change") {
       this.files[path] = null;
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
   };
   onReady = async () => {
@@ -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}`),
@@ -177,7 +175,7 @@ var Paralayer = class extends Unit {
     const LayerName = layer.split(".").map(this.capitalize).join("");
     if (style === "camel") return this.decapitalize(LayerName);
     if (style === "Pascal") return LayerName;
-    throw this.never;
+    throw this.never();
   }
   capitalize(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -195,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.9.0",
+  "version": "1.11.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,8 +33,8 @@
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.9.0",
-    "chokidar": "^4.0.3",
+    "chokidar": "^5.0.0",
+    "dropcap": "^1.0.0",
     "minimist": "^1.2.8"
   },
   "devDependencies": {

package/src/paralayer.ts

@@ -1,6 +1,5 @@
-import { Queue, Unit, safe } from '@eposlabs/utils'
-import type { FSWatcher } from 'chokidar'
-import { watch } from 'chokidar'
+import { watch, type FSWatcher } from 'chokidar'
+import { Queue, Unit, safe } from 'dropcap/utils'
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { basename, extname, join, relative } from 'node:path'
 
@@ -19,7 +18,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
 }
 
@@ -50,11 +49,10 @@ export class Paralayer extends Unit {
     this.watcher.on('ready', this.onReady)
 
     await this.ready$.promise
-    await this.queue.run(() => this.build())
+    await this.queue.add(() => 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')
   }
@@ -83,13 +81,13 @@ export class Paralayer extends Unit {
     // File removed? -> Remove and rebuild
     if (event === 'unlink') {
       delete this.files[path]
-      await this.queue.run(() => this.build())
+      await this.queue.add(() => this.build())
     }
 
     // File added/changed? -> Reset its content and rebuild
     if (event === 'add' || event === 'change') {
       this.files[path] = null
-      await this.queue.run(() => this.build())
+      await this.queue.add(() => this.build())
     }
   }
 
@@ -201,7 +199,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}`),
@@ -262,7 +260,7 @@ export class Paralayer extends Unit {
     const LayerName = layer.split('.').map(this.capitalize).join('')
     if (style === 'camel') return this.decapitalize(LayerName)
     if (style === 'Pascal') return LayerName
-    throw this.never
+    throw this.never()
   }
 
   private capitalize(string: string) {
@@ -285,9 +283,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