@windwalker-io/core 4.0.2 → 4.0.6

package/package.json

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

package/src/asset-sync.mjs

@@ -8,7 +8,9 @@
 import { dest as toDest, src } 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 path from 'path';
 
 export function jsSync(source = 'src/Module', dest) {
   // const root = source + '/**/assets/';
@@ -27,10 +29,13 @@ export function jsSync(source = 'src/Module', dest) {
   //   }
   // });
 
-  source += '/**/assets/*.{js,mjs}';
+  const sourceList = [];
+
+  sourceList.push(...findModules('**/assets/*.{js,mjs}'));
+  sourceList.push(source + '**/assets/*.{js,mjs}');
+
+  let stream = prepareStream(src(sourceList));
 
-  let stream = prepareStream(src(source));
-  //
   stream = stream.pipe(rename((path) => {
     path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
   }));
@@ -57,3 +62,23 @@ export function jsSync(source = 'src/Module', dest) {
     });
   });
 }
+
+export function findModules(suffix = '') {
+  const pkg = path.resolve(process.cwd(), 'composer.json');
+
+  const pkgJson = loadJson(pkg);
+
+  const vendors = Object.keys(pkgJson['require'] || {})
+    .concat(Object.keys(pkgJson['require-dev'] || {}))
+    .map(id => `vendor/${id}/composer.json`)
+    .map((file) => loadJson(file))
+    .filter(pkgJson => pkgJson?.extra?.windwalker != null)
+    .map(pkgJson => {
+      return pkgJson?.extra?.windwalker?.modules?.map((module) => {
+        return `vendor/${pkgJson.name}/${module}/${suffix}`;
+      }) || [];
+    })
+    .flat();
+
+  return [ ...new Set(vendors) ];
+}

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

@@ -7,11 +7,13 @@
 
 import { src, symlink, copy } from '@windwalker-io/fusion';
 import { extractDest } from '@windwalker-io/fusion/src/utilities/utilities.js';
+import { loadJson } from './utils.mjs';
 import path from 'path';
 import fs from 'fs';
 
-export async function installVendors(vendors) {
-  const root = 'www/assets/vendor';
+export async function installVendors(npmVendors, composerVendors = [], to = 'www/assets/vendor') {
+  const root = to;
+  let vendors = npmVendors;
 
   if (!fs.existsSync(root)) {
     fs.mkdirSync(root);
@@ -32,13 +34,20 @@ export async function installVendors(vendors) {
 
   vendors.forEach((vendor) => {
     if (fs.existsSync(`node_modules/${vendor}/`)) {
-      console.log(`[Link] node_modules/${vendor}/ => www/assets/vendor/${vendor}/`);
-      src(`node_modules/${vendor}/`).pipe(symlink(`www/assets/vendor/${vendor}`));
+      console.log(`[Link NPM] node_modules/${vendor}/ => ${root}/${vendor}/`);
+      src(`node_modules/${vendor}/`).pipe(symlink(`${root}/${vendor}`));
     }
   });
 
-  console.log('[Link] resources/assets/vendor/**/* => www/assets/vendor/');
-  src('resources/assets/vendor/*').pipe(symlink('www/assets/vendor/'));
+  composerVendors.forEach((vendor) => {
+    if (fs.existsSync(`vendor/${vendor}/assets`)) {
+      console.log(`[Link Composer] vendor/${vendor}/assets => ${root}/${vendor}/`);
+      src(`vendor/${vendor}/assets/`).pipe(symlink(`${root}/${vendor}/`));
+    }
+  });
+
+  console.log(`[Link Local] resources/assets/vendor/**/* => ${root}/`);
+  src('resources/assets/vendor/*').pipe(symlink(`${root}/`));
 }
 
 function findVendors() {
@@ -57,14 +66,6 @@ function findVendors() {
   return [ ...new Set(vendors) ];
 }
 
-function loadJson(file) {
-  if (!fs.existsSync(file)) {
-    return null;
-  }
-
-  return JSON.parse(fs.readFileSync(file));
-}
-
 function deleteLinks(dir) {
   const links = fs.readdirSync(dir, { withFileTypes: true })
     .filter(d => d.isSymbolicLink());

package/src/utils.mjs

@@ -0,0 +1,17 @@
+import fs from 'fs';
+
+/**
+ * Part of earth project.
+ *
+ * @copyright  Copyright (C) 2021 __ORGANIZATION__.
+ * @license    __LICENSE__
+ */
+
+
+export function loadJson(file) {
+  if (!fs.existsSync(file)) {
+    return null;
+  }
+
+  return JSON.parse(fs.readFileSync(file));
+}