paralayer 1.0.3 → 1.0.5

package/dist/bin.js

@@ -1,9 +1,9 @@
 import minimist from 'minimist';
-import { Paralayer } from './paralayer.js';
+import { paralayer } from './index.js';
 const argv = minimist(process.argv.slice(2), {
     string: ['default'],
     boolean: ['watch', 'globalize'],
-    default: { default: null, watch: false, globalize: false },
+    default: { watch: false, default: null, globalize: false },
 });
 const paths = argv._;
 const input = paths.slice(0, -1);
@@ -16,12 +16,10 @@ if (!output) {
     console.error('[paralayer] Output directory is not provided');
     process.exit(1);
 }
-const paralayer = new Paralayer({
+await paralayer({
     input: input,
     output: output,
-    globalize: argv.globalize,
-    default: argv.default,
-});
-await paralayer.start({
     watch: argv.watch,
+    default: argv.default,
+    globalize: argv.globalize,
 });

package/dist/index.d.ts

@@ -1 +1,3 @@
-export { Paralayer, type Options } from './paralayer.js';
+import { type Options } from './paralayer.js';
+export declare function paralayer(options: Options): Promise<string>;
+export default paralayer;

package/dist/index.js

@@ -1 +1,7 @@
-export { Paralayer } from './paralayer.js';
+import { Paralayer } from './paralayer.js';
+export async function paralayer(options) {
+    const pl = new Paralayer(options);
+    await pl.start();
+    return await pl.readSetupJs();
+}
+export default paralayer;

package/dist/paralayer.d.ts

@@ -1,5 +1,4 @@
 import * as $utils from '@eposlabs/utils';
-import type { Plugin } from 'vite';
 export type DirPath = string;
 export type File = {
     content: string;
@@ -8,6 +7,7 @@ export type File = {
 export type Options = {
     input: DirPath | DirPath[];
     output: DirPath;
+    watch?: boolean;
     /** Default layer name. If a file name does not have layer tags, default name will be used. */
     default?: string | null;
     /** Whether the layer variables should be exposed globally. */
@@ -23,14 +23,9 @@ export declare class Paralayer extends $utils.Unit {
     private extensions;
     private previousLayers;
     private watcher;
-    private viteConfig;
     constructor(options: Options);
-    get vite(): Plugin;
-    start: ({ watch }?: {
-        watch?: boolean | undefined;
-    }) => Promise<void>;
-    private onConfigResolved;
-    private onBuildStart;
+    start: () => Promise<void>;
+    readSetupJs(): Promise<string>;
     private onAll;
     private onReady;
     private build;

package/dist/paralayer.js

@@ -12,20 +12,11 @@ export class Paralayer extends $utils.Unit {
     extensions = new Set(['.ts', '.tsx', '.js', '.jsx']);
     previousLayers = [];
     watcher = null;
-    viteConfig = null;
     constructor(options) {
         super();
         this.options = options;
     }
-    get vite() {
-        return {
-            name: 'paralayer',
-            enforce: 'pre',
-            configResolved: this.onConfigResolved,
-            buildStart: this.onBuildStart,
-        };
-    }
-    start = async ({ watch = false } = {}) => {
+    start = async () => {
         if (this.started)
             return;
         this.started = true;
@@ -35,20 +26,13 @@ export class Paralayer extends $utils.Unit {
         this.watcher.on('ready', this.onReady);
         await this.ready$.promise;
         await this.queue.run(() => this.build());
-        if (!watch)
+        if (!this.options.watch)
             await this.watcher.close();
     };
-    // ---------------------------------------------------------------------------
-    // VITE HOOKS
-    // ---------------------------------------------------------------------------
-    onConfigResolved = (config) => {
-        this.viteConfig = config;
-    };
-    onBuildStart = async () => {
-        if (!this.viteConfig)
-            throw this.never;
-        await this.start({ watch: !!this.viteConfig.build.watch });
-    };
+    async readSetupJs() {
+        const setupJsPath = $path.join(this.options.output, 'setup.js');
+        return await $fs.readFile(setupJsPath, 'utf-8');
+    }
     // ---------------------------------------------------------------------------
     // HANDLERS
     // ---------------------------------------------------------------------------
@@ -190,7 +174,6 @@ export class Paralayer extends $utils.Unit {
         return [...imports].join('\n');
     }
     generateSetupContent(allLayers) {
-        const nocheck = '// @ts-nocheck';
         const layers = allLayers.toSorted((layer1, layer2) => {
             if (layer1.length !== layer2.length)
                 return layer1.length - layer2.length;
@@ -198,17 +181,11 @@ export class Paralayer extends $utils.Unit {
         });
         const vars = layers.map(layer => {
             const $layerName = this.getLayerName(layer, '$camel');
+            if (this.options.globalize)
+                return `globalThis.${$layerName} = {}`;
             return `const ${$layerName} = {}`;
         });
-        let globals = [];
-        if (this.options.globalize) {
-            globals = layers.map(layer => {
-                const $layerName = this.getLayerName(layer, '$camel');
-                return `globalThis.${$layerName} = ${$layerName}`;
-            });
-            globals.unshift('');
-        }
-        return [nocheck, '', ...vars, ...globals, ''].join('\n');
+        return [...vars].join('\n');
     }
     getLayer(path) {
         const name = $path.basename(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paralayer",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -13,9 +13,7 @@
     "dev": "rm -rf dist && tsc --watch",
     "build": "rm -rf dist && tsc",
     "lint": "tsc --noEmit",
-    "release": "npm version patch && npm run release:raw",
-    "release:raw": "npm run build && npm publish",
-    "release:minor": "npm version minor && npm run release:raw"
+    "release": "sh -c 'npm version ${1:-patch} && npm run build && npm publish' --"
   },
   "bin": {
     "paralayer": "bin.js"
@@ -24,10 +22,6 @@
     ".": {
       "default": "./dist/index.js",
       "types": "./dist/index.d.ts"
-    },
-    "./vite": {
-      "default": "./dist/vite.js",
-      "types": "./dist/vite.d.ts"
     }
   },
   "files": [
@@ -35,7 +29,7 @@
     "bin.js"
   ],
   "dependencies": {
-    "chalk": "^5.6.0",
+    "@eposlabs/utils": "^1.0.0",
     "chokidar": "^4.0.3",
     "minimist": "^1.2.8"
   },

package/dist/vite.d.ts

@@ -1,2 +0,0 @@
-import { type Options } from './paralayer.js';
-export default function paralayer(options: Options): import("vite").Plugin<any>;

package/dist/vite.js

@@ -1,4 +0,0 @@
-import { Paralayer } from './paralayer.js';
-export default function paralayer(options) {
-    return new Paralayer(options).vite;
-}