@windwalker-io/core 4.2.1 → 4.2.2

package/dist/next.d.ts

@@ -18,6 +18,13 @@ export declare function containsMiddleGlob(str: string): boolean;
 
 export declare function cssModulize(entry: string, dest: string): CssModulizeProcessor;
 
+export declare function cssModulizeDeep(stage: string, entry: string, dest: string, options?: CssModulizeDeepOptions): CssModulizeProcessor;
+
+export declare interface CssModulizeDeepOptions {
+    mergeCss?: boolean;
+    parseBlades?: boolean;
+}
+
 declare class CssModulizeProcessor implements ProcessorInterface {
     protected processor: ReturnType<typeof css>;
     protected bladePatterns: string[];
@@ -54,7 +61,14 @@ export declare function installVendors(npmVendors?: string[], to?: string): {
 
 export declare function jsModulize(entry: string, dest: string, options?: JsModulizeOptions): JsModulizeProcessor;
 
-declare interface JsModulizeOptions {
+export declare function jsModulizeDeep(stage: string, entry: string, dest: string, options?: JsModulizeDeepOptions): JsModulizeProcessor;
+
+export declare interface JsModulizeDeepOptions extends JsModulizeOptions {
+    mergeScripts?: boolean;
+    parseBlades?: boolean;
+}
+
+export declare interface JsModulizeOptions {
     tmpPath?: string;
     cleanTmp?: boolean;
 }

package/dist/next.js

@@ -55,7 +55,7 @@ function findModules(suffix = "", rootModule = "src/Module") {
     }) || [];
   }).flat();
   if (rootModule) {
-    vendors.unshift(rootModule + "/" + suffix);
+    vendors.push(rootModule + "/" + suffix);
   }
   return [...new Set(vendors)];
 }
@@ -199,6 +199,19 @@ function systemCSSFix() {
 function cssModulize(entry, dest) {
   return new CssModulizeProcessor(css(entry, dest));
 }
+function cssModulizeDeep(stage, entry, dest, options = {}) {
+  const processor = cssModulize(entry, dest);
+  if (options.mergeCss ?? true) {
+    processor.mergeCss(findModules(`${stage}/**/assets/*.scss`));
+  }
+  if (options.parseBlades ?? true) {
+    processor.parseBlades(
+      findModules(`${stage}/**/*.blade.php`),
+      findPackages("views/**/*.blade.php")
+    );
+  }
+  return processor;
+}
 class CssModulizeProcessor {
   constructor(processor, bladePatterns = [], cssPatterns = []) {
     this.processor = processor;
@@ -267,6 +280,21 @@ ${imports}
 function jsModulize(entry, dest, options = {}) {
   return new JsModulizeProcessor(js(entry, dest), options);
 }
+function jsModulizeDeep(stage, entry, dest, options = {}) {
+  const processor = jsModulize(entry, dest, options).stage(stage.toLowerCase());
+  if (options.mergeScripts ?? true) {
+    processor.mergeScripts(
+      findModules(`${stage}/**/assets/*.ts`)
+    );
+  }
+  if (options.parseBlades ?? true) {
+    processor.parseBlades(
+      findModules(`${stage}/**/*.blade.php`),
+      findPackages("views/**/*.blade.php")
+    );
+  }
+  return processor;
+}
 class JsModulizeProcessor {
   constructor(processor, options = {}) {
     this.processor = processor;
@@ -293,11 +321,13 @@ class JsModulizeProcessor {
       }
     });
     const scriptFiles = findFilesFromGlobArray(this.scriptPatterns);
-    const bladeFiles = parseScriptsFromBlades(this.bladePatterns);
+    const bladeFiles = findBladeFiles(this.bladePatterns);
     builder.loadCallbacks.push((src, options) => {
       const srcFile = stripUrlQuery(src);
+      const scripts = {};
       if (normalize(srcFile) === inputFile) {
-        let listJS = "{\n";
+        const bladeScripts = parseScriptsFromBlades(bladeFiles);
+        fs$1.removeSync(tmpPath);
         for (const scriptFile of scriptFiles) {
           let fullpath = scriptFile.fullpath;
           if (fullpath.endsWith(".d.ts")) {
@@ -310,25 +340,30 @@ class JsModulizeProcessor {
             key = this.stagePrefix + "/" + key;
           }
           key = "view:" + crypto.createHash("md5").update(key).digest("hex");
-          listJS += `'${key}': () => import('${fullpath}'),
-`;
+          scripts[key] = fullpath;
         }
         const listens = [];
         fs$1.ensureDirSync(tmpPath);
-        for (const result of bladeFiles) {
+        for (const result of bladeScripts) {
           let key = result.as;
           const tmpFile = tmpPath + "/" + result.path.replace(/\\|\//g, "_") + "-" + shortHash(result.code) + ".ts";
           if (!fs$1.existsSync(tmpFile) || fs$1.readFileSync(tmpFile, "utf8") !== result.code) {
             fs$1.writeFileSync(tmpFile, result.code);
           }
-          listJS += `'inline:${key}': () => import('${tmpFile}'),
-`;
+          scripts[`inline:${key}`] = tmpFile;
           const fullpath = resolve(result.file.fullpath).replace(/\\/g, "/");
           if (!listens.includes(fullpath)) {
             listens.push(fullpath);
           }
         }
-        listJS += "}";
+        let listJS = `{
+`;
+        for (const key in scripts) {
+          const fullpath = scripts[key];
+          listJS += `'${key}': () => import('${fullpath}'),
+`;
+        }
+        listJS += `}`;
         builder.watches.push(...listens);
         let { code, comments } = stripComments(fs$1.readFileSync(srcFile, "utf-8"));
         code = code.replace(/defineJsModules\((.*?)\)/g, listJS);
@@ -371,8 +406,10 @@ class JsModulizeProcessor {
     return this;
   }
 }
-function parseScriptsFromBlades(patterns) {
-  let files = findFilesFromGlobArray(Array.isArray(patterns) ? patterns : [patterns]);
+function findBladeFiles(patterns) {
+  return findFilesFromGlobArray(Array.isArray(patterns) ? patterns : [patterns]);
+}
+function parseScriptsFromBlades(files) {
   return files.map((file) => {
     const bladeText = fs$1.readFileSync(file.fullpath, "utf8");
     const html = parse(bladeText);
@@ -520,6 +557,7 @@ export {
   cloneAssets,
   containsMiddleGlob,
   cssModulize,
+  cssModulizeDeep,
   ensureDirPath,
   findFilesFromGlobArray,
   findModules,
@@ -528,6 +566,7 @@ export {
   injectSystemJS,
   installVendors,
   jsModulize,
+  jsModulizeDeep,
   loadJson,
   removeLastGlob,
   resolveModuleRealpath,

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@windwalker-io/core",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "type": "module",
   "description": "Windwalker Core JS package",
   "scripts": {
     "build": "yarn build:next && yarn build:debugger",
     "dev": "yarn dev:debugger",
-    "build:next": "vite build --config vite.config.next.ts",
+    "build:next": "vite build --config vite.next.config.ts",
     "dev:next": "yarn build:next --watch",
-    "build:debugger": "vite build --config vite.config.debugger.ts",
-    "dev:debugger": "vite --config vite.config.debugger.ts"
+    "build:debugger": "vite build --config vite.debugger.config.ts",
+    "dev:debugger": "vite --config vite.debugger.config.ts"
   },
   "exports": {
     ".": "./src/index.js",

package/src/app/app.ts

@@ -1,8 +1,12 @@
 type Route = string | RouteLoader;
 type RouteLoader = () => Promise<any>;
 
+let currentProps: Record<string, any> | null = null;
+
 export class App {
   routes: Record<string, RouteLoader> = {};
+  queue: (() => Promise<any>)[] = [];
+  queueRunning = false;
 
   constructor(routes: Record<string, Route> = {}) {
     this.registerRoutes(routes);
@@ -42,9 +46,48 @@ export class App {
     return target();
   }
 
+  async importSync<T = any>(route: string, props: Record<string, any> = {}): Promise<T> {
+    return new Promise<any>((resolve) => {
+      const target = this.routes[route];
+
+      if (!target) {
+        throw new Error(`Unable to import file: ${route}, file not found.`);
+      }
+
+      this.queue.push(async () => {
+        currentProps = props;
+        resolve(await target());
+      });
+
+      this.runQueue();
+    });
+  }
+
+  async runQueue() {
+    if (!this.queueRunning) {
+      this.queueRunning = true;
+      let item: () => any;
+
+      while (item = this.queue.shift()) {
+        await item();
+      }
+
+      this.queueRunning = false;
+    }
+  }
+
   reset() {
     this.routes = {};
 
     return this;
   }
 }
+
+export function useMacroProps<T extends Record<string, any> = Record<string, any>>(): T {
+  console.log('get');
+  if (currentProps == null) {
+    throw new Error('Cannot get macro props.');
+  }
+  
+  return { ...currentProps } as T;
+}

package/src/asset-bundler.mjs

@@ -1,114 +1,114 @@
-import { webpackBundle } from '@windwalker-io/fusion';
-import fs from 'fs';
-import { globSync } from 'glob';
-import path from 'path';
-import { findModules } from './asset-sync.mjs';
-
-/**
- *
- * @param {string} mainFile
- * @param {string|string[]} source
- * @param {string} dest
- * @param {any} options
- * @returns {Promise<any>}
- */
-export async function bundleJS(
-  mainFile = `./resources/assets/src/app.ts`,
-  source = 'src/Module/**/*.ts',
-  dest = 'www/assets/js/app/app.js',
-  options = {}
-) {
-  const workingDir = process.cwd();
-
-  if (typeof source === 'string') {
-    source = [source];
-  }
-
-  const files = findFilesFromGlobArray([
-    ...findModules('**/assets/*.ts'),
-    ...source,
-  ]);
-
-  let listJS = "{\n";
-
-  for (const file of files) {
-    if (file.fullpath.endsWith('.d.ts')) {
-      continue;
-    }
-
-    let key = file.relativePath.replace(/assets$/, '').toLowerCase();
-    key = key.substring(0, key.lastIndexOf('.'));
-    listJS += `'${key}': () => import('${file.fullpath}'),\n`;
-  }
-
-  listJS += "}";
-
-  let ts = `
-import loader from '@windwalker-io/core/src/loader/core-loader.ts';
-
-loader.register(${listJS});
-
-export default loader;
-  `;
-
-  // const base64 = Buffer.from(ts).toString('base64');
-  // const dataUri = `data:text/javascript;base64,${base64}`;
-  const tmpDir = workingDir + '/tmp/fusion';
-  fs.mkdirSync(tmpDir, { recursive: true });
-
-  const tmpFile = tmpDir + '/app.js';
-  fs.writeFileSync(tmpFile, ts);
-
-  const r = await webpackBundle(
-    tmpFile,
-    dest,
-    (config) => {
-      config.devtool = false;
-      // config.entry = dataUri;
-      // config.output.uniqueName = 'app';
-      config.output.libraryTarget = 'module';
-      config.experiments.outputModule = true;
-      config.resolve.modules.push(path.resolve('./'));
-      config.context = path.resolve('./');
-      config.resolve.alias = {
-        '@main': path.resolve(mainFile),
-        '@app': path.resolve(mainFile),
-      };
-    }
-  );
-
-  // fs.unlinkSync(tmpFile);
-
-  return r;
-}
-
-  function findFilesFromGlobArray(sources) {
-    let files = [];
-
-    for (const source of sources) {
-      files = [
-        ...files,
-        ...findFiles(source)
-      ];
-    }
-
-    return files;
-  }
-
-  /**
-   * @param {string} src
-   */
-  function findFiles(src) {
-    const i = src.lastIndexOf('**');
-
-    const path = src.substring(0, i);
-
-    return globSync(src).map((file) => {
-      file = file.replace(/\\/g, '/');
-
-      return {
-        fullpath: file,
-        relativePath: file.substring(path.length)
-      };
-    });
-  }
+import { webpackBundle } from '@windwalker-io/fusion';
+import fs from 'fs';
+import { globSync } from 'glob';
+import path from 'path';
+import { findModules } from './asset-sync.mjs';
+
+/**
+ *
+ * @param {string} mainFile
+ * @param {string|string[]} source
+ * @param {string} dest
+ * @param {any} options
+ * @returns {Promise<any>}
+ */
+export async function bundleJS(
+  mainFile = `./resources/assets/src/app.ts`,
+  source = 'src/Module/**/*.ts',
+  dest = 'www/assets/js/app/app.js',
+  options = {}
+) {
+  const workingDir = process.cwd();
+
+  if (typeof source === 'string') {
+    source = [source];
+  }
+
+  const files = findFilesFromGlobArray([
+    ...findModules('**/assets/*.ts'),
+    ...source,
+  ]);
+
+  let listJS = "{\n";
+
+  for (const file of files) {
+    if (file.fullpath.endsWith('.d.ts')) {
+      continue;
+    }
+
+    let key = file.relativePath.replace(/assets$/, '').toLowerCase();
+    key = key.substring(0, key.lastIndexOf('.'));
+    listJS += `'${key}': () => import('${file.fullpath}'),\n`;
+  }
+
+  listJS += "}";
+
+  let ts = `
+import loader from '@windwalker-io/core/src/loader/core-loader.ts';
+
+loader.register(${listJS});
+
+export default loader;
+  `;
+
+  // const base64 = Buffer.from(ts).toString('base64');
+  // const dataUri = `data:text/javascript;base64,${base64}`;
+  const tmpDir = workingDir + '/tmp/fusion';
+  fs.mkdirSync(tmpDir, { recursive: true });
+
+  const tmpFile = tmpDir + '/app.js';
+  fs.writeFileSync(tmpFile, ts);
+
+  const r = await webpackBundle(
+    tmpFile,
+    dest,
+    (config) => {
+      config.devtool = false;
+      // config.entry = dataUri;
+      // config.output.uniqueName = 'app';
+      config.output.libraryTarget = 'module';
+      config.experiments.outputModule = true;
+      config.resolve.modules.push(path.resolve('./'));
+      config.context = path.resolve('./');
+      config.resolve.alias = {
+        '@main': path.resolve(mainFile),
+        '@app': path.resolve(mainFile),
+      };
+    }
+  );
+
+  // fs.unlinkSync(tmpFile);
+
+  return r;
+}
+
+  function findFilesFromGlobArray(sources) {
+    let files = [];
+
+    for (const source of sources) {
+      files = [
+        ...files,
+        ...findFiles(source)
+      ];
+    }
+
+    return files;
+  }
+
+  /**
+   * @param {string} src
+   */
+  function findFiles(src) {
+    const i = src.lastIndexOf('**');
+
+    const path = src.substring(0, i);
+
+    return globSync(src).map((file) => {
+      file = file.replace(/\\/g, '/');
+
+      return {
+        fullpath: file,
+        relativePath: file.substring(path.length)
+      };
+    });
+  }

package/src/debugger/types/global.d.js

@@ -1,2 +1,2 @@
-declare module '*.jpg';
-declare module '*.svg';
+declare module '*.jpg';
+declare module '*.svg';

package/src/index.mjs

@@ -1,11 +1,11 @@
-/**
- * Part of funclass project.
- *
- * @copyright  Copyright (C) 2021 LYRASOFT.
- * @license    __LICENSE__
- */
-
-export * from './asset-sync.mjs';
-export * from './asset-bundler.mjs';
-export * from './install-vendors.mjs';
-export * from './app.ts';
+/**
+ * Part of funclass project.
+ *
+ * @copyright  Copyright (C) 2021 LYRASOFT.
+ * @license    __LICENSE__
+ */
+
+export * from './asset-sync.mjs';
+export * from './asset-bundler.mjs';
+export * from './install-vendors.mjs';
+export * from './app.ts';

package/src/legacy/4.0/js-sync.mjs

@@ -1,74 +1,74 @@
-import { findModules } from '@windwalker-io/core/src/index.mjs';
-import { dest as toDest, src, ts } from '@windwalker-io/fusion';
-import { postStream, prepareStream } from '@windwalker-io/fusion/src/lifecycles.js';
-import { extractDest } from '@windwalker-io/fusion/src/utilities/utilities.js';
-import { existsSync } from 'fs';
-import rename from 'gulp-rename';
-import path from 'path';
-
-/**
- * @deprecated
- */
-export function jsSync(source = 'src/Module', dest, options = {}) {
-  const tsOptions = options.ts || {};
-
-  if (!tsOptions.tsconfig) {
-    tsOptions.tsconfig = path.resolve('tsconfig.json');
-
-    if (!existsSync(tsOptions.tsconfig)) {
-      tsOptions.tsconfig = path.resolve('node_modules/@windwalker-io/unicorn/tsconfig.js.json');
-    }
-  }
-
-  const sourceList = [];
-
-  sourceList.push(...findModules('**/assets/*.{js,mjs}'));
-  sourceList.push(source + '**/assets/*.{js,mjs}');
-
-  let stream = prepareStream(src(sourceList));
-
-  stream = stream.pipe(rename((path) => {
-    path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
-  }));
-
-  const jsDest = extractDest(dest);
-
-  //
-  // // if (dest.merge) {
-  // //   stream = stream.pipe(rename(path.basename(dest.file)));
-  // // }
-  //
-  stream = stream.pipe(toDest(jsDest.path).on('error', e => console.error(e)));
-
-  return Promise.all([
-    new Promise((resolve) => {
-      postStream(stream).on('end', (event) => {
-        const data = {
-          event,
-          src,
-          dest: jsDest,
-          stream
-        };
-
-        resolve(data);
-      });
-    }),
-    // Legacy mode
-    ts(
-      [
-        ...findModules('**/assets/*.ts'),
-        'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
-        `${source}/**/*.ts`,
-      ],
-      dest,
-      {
-        rename: (path) => {
-          path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
-        },
-        ...tsOptions
-      }
-    )
-  ]).then((v) => {
-    return v[0];
-  });
-}
+import { findModules } from '@windwalker-io/core/src/index.mjs';
+import { dest as toDest, src, ts } from '@windwalker-io/fusion';
+import { postStream, prepareStream } from '@windwalker-io/fusion/src/lifecycles.js';
+import { extractDest } from '@windwalker-io/fusion/src/utilities/utilities.js';
+import { existsSync } from 'fs';
+import rename from 'gulp-rename';
+import path from 'path';
+
+/**
+ * @deprecated
+ */
+export function jsSync(source = 'src/Module', dest, options = {}) {
+  const tsOptions = options.ts || {};
+
+  if (!tsOptions.tsconfig) {
+    tsOptions.tsconfig = path.resolve('tsconfig.json');
+
+    if (!existsSync(tsOptions.tsconfig)) {
+      tsOptions.tsconfig = path.resolve('node_modules/@windwalker-io/unicorn/tsconfig.js.json');
+    }
+  }
+
+  const sourceList = [];
+
+  sourceList.push(...findModules('**/assets/*.{js,mjs}'));
+  sourceList.push(source + '**/assets/*.{js,mjs}');
+
+  let stream = prepareStream(src(sourceList));
+
+  stream = stream.pipe(rename((path) => {
+    path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
+  }));
+
+  const jsDest = extractDest(dest);
+
+  //
+  // // if (dest.merge) {
+  // //   stream = stream.pipe(rename(path.basename(dest.file)));
+  // // }
+  //
+  stream = stream.pipe(toDest(jsDest.path).on('error', e => console.error(e)));
+
+  return Promise.all([
+    new Promise((resolve) => {
+      postStream(stream).on('end', (event) => {
+        const data = {
+          event,
+          src,
+          dest: jsDest,
+          stream
+        };
+
+        resolve(data);
+      });
+    }),
+    // Legacy mode
+    ts(
+      [
+        ...findModules('**/assets/*.ts'),
+        'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
+        `${source}/**/*.ts`,
+      ],
+      dest,
+      {
+        rename: (path) => {
+          path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
+        },
+        ...tsOptions
+      }
+    )
+  ]).then((v) => {
+    return v[0];
+  });
+}

package/src/next/fusion/index.ts

@@ -1,2 +1,2 @@
-export * from './plugins';
-export * from './processors';
+export * from './plugins';
+export * from './processors';