@windwalker-io/core 4.1.0 → 4.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windwalker-io/core",
-    "version": "4.1.0",
+    "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 || {};
@@ -97,12 +41,13 @@ export function syncModuleTS(source = 'src/Module', dest = 'www/assets/js/view/'
   return ts(
     [
       `${source}/**/*.ts`,
-      'node_modules/@windwalker-io/core/types/**.d.ts',
+      // Todo: Research if tsconfig.json can replace this line
+      'resources/assets/src/**/*.d.ts',
       ...findModules('**/assets/*.ts')
     ],
     dest,
     {
-      tsconfig: path.resolve('tsconfig.js.json'),
+      tsconfig: path.resolve('tsconfig.json'),
       rename: (path) => {
         path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
       },
@@ -128,5 +73,5 @@ export function findModules(suffix = '') {
     })
     .flat();
 
-  return [ ...new Set(vendors) ];
+  return [...new Set(vendors)];
 }

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/debugger/webpack.config.js

@@ -1,9 +1,9 @@
-const path = require('path');
-
-module.exports = {
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname),
-    }
-  }
-};
+const path = require('path');
+
+module.exports = {
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname),
+    }
+  }
+};

package/src/index.mjs

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

package/src/install-vendors.mjs

@@ -87,8 +87,12 @@ function findNpmVendors(composerJsons = []) {
     .flat();
 
   const vendorsFromComposer = composerJsons
-    .map((composerJson) => composerJson?.extra?.windwalker?.assets?.vendors || {})
-    .map((vendors) => Object.keys(vendors))
+    .map((composerJson) => {
+      return [
+        ...composerJson?.extra?.windwalker?.asset_vendors || [],
+        ...Object.keys(composerJson?.extra?.windwalker?.assets?.vendors || {})
+      ]
+    })
     .flat();
 
   return [ ...new Set(vendors.concat(vendorsFromComposer)) ];

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];
+  });
+}

package/tsconfig.js.json

@@ -1,15 +0,0 @@
-{
-    "include": [
-        "types/index.d.ts"
-    ],
-    "exclude": [
-        "node_modules/**/*"
-    ],
-    "compilerOptions": {
-        "allowJs": true,
-        "module": "system",
-        "moduleResolution": "node",
-        "target": "es2020",
-        "skipLibCheck": true
-    }
-}

package/types/global.d.ts

@@ -1,12 +0,0 @@
-import '@windwalker-io/unicorn';
-import 'systemjs';
-import 'jquery';
-import 'axios';
-import boostrap from 'bootstrap';
-import * as vue from 'vue';
-
-declare global {
-  var S:  typeof System;
-  var bootstrap: typeof boostrap;
-  var Vue: typeof vue;
-}

package/types/index.d.ts

@@ -1,5 +0,0 @@
-
-import './global';
-import './shims-sweetalert';
-import './unicorn';
-import './vendor';

package/types/shims-sweetalert.d.ts

@@ -1,8 +0,0 @@
-import { SwalParams } from "sweetalert/typings/core";
-
-declare global {
-  const swal: (...params: SwalParams) => Promise<any>;
-}
-
-// export default swal;
-// export as namespace swal;

package/types/unicorn.d.ts

@@ -1 +0,0 @@
-declare module "@unicorn/*";

package/types/vendor.d.ts

@@ -1 +0,0 @@
-declare module "@vendor/*";

package/types/vue/global.d.ts

@@ -1,14 +0,0 @@
-/**
- * Part of cati project.
- *
- * @copyright  Copyright (C) 2023 __ORGANIZATION__.
- * @license    __LICENSE__
- */
-
-import '@windwalker-io/unicorn';
-import 'systemjs';
-import 'axios';
-
-declare global {
-  var S:  typeof System;
-}

package/types/vue/shims-vue.d.ts

@@ -1,5 +0,0 @@
-declare module '*.vue' {
-  import { defineComponent } from 'vue'
-  const component: ReturnType<typeof defineComponent>
-  export default component
-}

package/types/vue/vue-runtime.d.ts

@@ -1,16 +0,0 @@
-/**
- * Part of cati project.
- *
- * @copyright  Copyright (C) 2023 __ORGANIZATION__.
- * @license    __LICENSE__
- */
-
-import Vue from 'vue'
-
-declare module '@vue/runtime-core' {
-  interface ComponentCustomProperties {
-    $lang: Function;
-    questionProp: Function;
-    introtext: Function;
-  }
-}