@windwalker-io/core 4.1.1 → 4.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windwalker-io/core",
-    "version": "4.1.1",
+    "version": "4.1.2",
     "type": "module",
     "description": "Windwalker Core JS package",
     "scripts": {

package/src/asset-sync.mjs

@@ -5,66 +5,10 @@
  * @license    __LICENSE__
  */
 
-import { babel, dest as toDest, src, ts, wait } 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 { loadJson } from './utils.mjs';
-import rename from 'gulp-rename';
+import { babel, ts } from '@windwalker-io/fusion';
 import path from 'path';
-
-/**
- * @deprecated
- */
-export function jsSync(source = 'src/Module', dest) {
-  // const root = source + '/**/assets/';
-
-  // glob(root, {}, function (err, dirs) {
-  //   for (let dir of dirs) {
-  //     glob(dir + '/**/*.{js,mjs}', { absolute: false }, (erro, files) => {
-  //       console.log(files);
-  //
-  //       for (let file of files) {
-  //         console.log(
-  //           path.relative(dir, file)
-  //         );
-  //       }
-  //     });
-  //   }
-  // });
-
-  const sourceList = [];
-
-  sourceList.push(...findModules('**/assets/*.{js,mjs,ts}'));
-  sourceList.push(source + '**/assets/*.{js,mjs,ts}');
-
-  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 new Promise((resolve) => {
-    postStream(stream).on('end', (event) => {
-      const data = {
-        event,
-        src,
-        dest: jsDest,
-        stream
-      };
-
-      resolve(data);
-    });
-  });
-}
+import { loadJson } from './utils.mjs';
+export * from './legacy/4.0/js-aync.mjs';
 
 export function syncModuleScripts(source = 'src/Module', dest = 'www/assets/js/view/', options = {}) {
   const jsOptions = options.js || {};
@@ -103,7 +47,7 @@ export function syncModuleTS(source = 'src/Module', dest = 'www/assets/js/view/'
     ],
     dest,
     {
-      tsconfig: path.resolve('tsconfig.js.json'),
+      tsconfig: path.resolve('tsconfig.json'),
       rename: (path) => {
         path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
       },
@@ -129,5 +73,5 @@ export function findModules(suffix = '') {
     })
     .flat();
 
-  return [ ...new Set(vendors) ];
+  return [...new Set(vendors)];
 }

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

@@ -0,0 +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(
+      [
+        `${source}/**/*.ts`,
+        'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
+        ...findModules('**/assets/*.ts')
+      ],
+      dest,
+      {
+        rename: (path) => {
+          path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
+        },
+        ...tsOptions
+      }
+    )
+  ]).then((v) => {
+    return v[0];
+  });
+}