vx: support namespaced exports

.gitignore

@@ -4,6 +4,7 @@ packages/vest/classnames/
 packages/vest/promisify/
 packages/vest/parser/
 packages/vest/enforce-compose/
+packages/vest/enforce/
 packages/anyone/all/
 packages/anyone/any/
 packages/anyone/none/

packages/n4s/package.json

@@ -9,9 +9,7 @@
     "test": "vx test",
     "release": "vx release"
   },
-  "dependencies": {
-    "context": "next"
-  },
+  "dependencies": {},
   "module": "./dist/es/n4s.production.js",
   "exports": {
     "./compose": {

packages/vest/package.json

@@ -19,10 +19,7 @@
   "bugs": {
     "url": "https://github.com/ealush/vest.git/issues"
   },
-  "dependencies": {
-    "n4s": "next",
-    "context": "next"
-  },
+  "dependencies": {},
   "homepage": "https://vestjs.dev/",
   "exports": {
     "./classnames": {
@@ -55,35 +52,35 @@
       "module": "./dist/es/classnames.production.js",
       "default": "./dist/cjs/classnames.js"
     },
-    "./enforce-compose": {
+    "./compose": {
       "production": {
-        "types": "./types/enforce-compose.d.ts",
-        "browser": "./dist/es/enforce-compose.production.js",
-        "umd": "./dist/umd/enforce-compose.production.js",
-        "import": "./dist/es/enforce-compose.production.js",
-        "require": "./dist/cjs/enforce-compose.production.js",
-        "node": "./dist/cjs/enforce-compose.production.js",
-        "module": "./dist/es/enforce-compose.production.js",
-        "default": "./dist/cjs/enforce-compose.production.js"
+        "types": "./../types/enforce/compose.d.ts",
+        "browser": "./../dist/es/enforce/compose.production.js",
+        "umd": "./../dist/umd/enforce/compose.production.js",
+        "import": "./../dist/es/enforce/compose.production.js",
+        "require": "./../dist/cjs/enforce/compose.production.js",
+        "node": "./../dist/cjs/enforce/compose.production.js",
+        "module": "./../dist/es/enforce/compose.production.js",
+        "default": "./../dist/cjs/enforce/compose.production.js"
       },
       "development": {
-        "types": "./types/enforce-compose.d.ts",
-        "browser": "./dist/es/enforce-compose.development.js",
-        "umd": "./dist/umd/enforce-compose.development.js",
-        "import": "./dist/es/enforce-compose.development.js",
-        "require": "./dist/cjs/enforce-compose.development.js",
-        "node": "./dist/cjs/enforce-compose.development.js",
-        "module": "./dist/es/enforce-compose.development.js",
-        "default": "./dist/cjs/enforce-compose.development.js"
+        "types": "./../types/enforce/compose.d.ts",
+        "browser": "./../dist/es/enforce/compose.development.js",
+        "umd": "./../dist/umd/enforce/compose.development.js",
+        "import": "./../dist/es/enforce/compose.development.js",
+        "require": "./../dist/cjs/enforce/compose.development.js",
+        "node": "./../dist/cjs/enforce/compose.development.js",
+        "module": "./../dist/es/enforce/compose.development.js",
+        "default": "./../dist/cjs/enforce/compose.development.js"
       },
-      "types": "./types/enforce-compose.d.ts",
-      "browser": "./dist/es/enforce-compose.production.js",
-      "umd": "./dist/umd/enforce-compose.production.js",
-      "import": "./dist/es/enforce-compose.production.js",
-      "require": "./dist/cjs/enforce-compose.js",
-      "node": "./dist/cjs/enforce-compose.js",
-      "module": "./dist/es/enforce-compose.production.js",
-      "default": "./dist/cjs/enforce-compose.js"
+      "types": "./../types/enforce/compose.d.ts",
+      "browser": "./../dist/es/enforce/compose.production.js",
+      "umd": "./../dist/umd/enforce/compose.production.js",
+      "import": "./../dist/es/enforce/compose.production.js",
+      "require": "./../dist/cjs/enforce/compose.js",
+      "node": "./../dist/cjs/enforce/compose.js",
+      "module": "./../dist/es/enforce/compose.production.js",
+      "default": "./../dist/cjs/enforce/compose.js"
     },
     "./parser": {
       "production": {

vx/config/rollup/plugins/handleExports.js

@@ -17,7 +17,7 @@ function isMain(name) {
   return usePackage() === name;
 }
 
-function handleExports() {
+function handleExports({ namespace } = {}) {
   return {
     name: 'write-cjs-main',
     writeBundle: once(({ name }) => {
@@ -26,11 +26,11 @@ function handleExports() {
       let exportPath = rootPath;
 
       if (!isMain(name)) {
-        exportPath = joinPath(rootPath, name);
+        exportPath = joinPath(rootPath, namespace, name);
         fse.ensureDirSync(exportPath);
       }
 
-      writePackageJson(name, exportPath);
+      writePackageJson(name, exportPath, namespace);
 
       fse.writeFileSync(
         vxPath.package(usePackage(), mainExport(name)),
@@ -60,30 +60,31 @@ if (process.env.NODE_ENV === '${opts.env.PRODUCTION}') {
 }`;
 }
 
-function genPackageJson(name) {
+function genPackageJson(name, namespace) {
   const isTopLevel = isMain(name);
   const esPath = genDistPath(
     isTopLevel,
+    namespace,
     name,
     opts.format.ES,
     opts.env.PRODUCTION
   );
-  const cjsPath = genDistPath(isTopLevel, name, opts.format.CJS);
+  const cjsPath = genDistPath(isTopLevel, namespace, name, opts.format.CJS);
   return {
     main: cjsPath,
     module: esPath,
     name,
-    types: typesPath(name),
+    types: typesPath([name, namespace]),
     ...(isTopLevel
       ? {
           exports: {
             ...genExportedFiles(),
             /* eslint-disable sort-keys */
             '.': {
               [opts.env.DEVELOPMENT]: {
-                ...exportsOrder(name, opts.env.DEVELOPMENT),
+                ...exportsOrder([name], opts.env.DEVELOPMENT),
               },
-              ...exportsOrder(name),
+              ...exportsOrder([name]),
             },
             './package.json': './package.json',
             './': './',
@@ -103,8 +104,8 @@ function genPackageJson(name) {
   };
 }
 
-function writePackageJson(name, exportPath) {
-  let pkgJson = genPackageJson(name);
+function writePackageJson(name, exportPath, namespace) {
+  let pkgJson = genPackageJson(name, namespace);
 
   if (isMain(name)) {
     pkgJson = { ...packageJson(name), ...pkgJson };
@@ -116,7 +117,7 @@ function writePackageJson(name, exportPath) {
 }
 
 function joinPath(...paths) {
-  return paths.join(path.sep); // this combats the trimming of the first dot in the path
+  return paths.filter(Boolean).join(path.sep); // this combats the trimming of the first dot in the path
 }
 
 function mainExport(name) {
@@ -136,40 +137,48 @@ function exportName(name, env) {
 }
 
 function genExportedFiles() {
-  return listExportedModules().reduce((modules, moduleName) => {
+  return listExportedModules().reduce((modules, [moduleName, namespace]) => {
     const currentModule = {};
     modules[`./${moduleName}`] = currentModule;
 
     [opts.env.PRODUCTION, opts.env.DEVELOPMENT].reduce((currentModule, env) => {
-      currentModule[env] = exportsOrder(moduleName, env);
+      currentModule[env] = exportsOrder([moduleName, namespace], env);
 
       return currentModule;
     }, currentModule);
 
-    Object.assign(currentModule, exportsOrder(moduleName));
+    Object.assign(currentModule, exportsOrder([moduleName, namespace]));
 
     return modules;
   }, {});
 }
 
-function exportsOrder(moduleName, env = undefined) {
+function exportsOrder([moduleName, namespace], env = undefined) {
   const isTopLevel = true;
   const esPath = genDistPath(
     isTopLevel,
+    namespace,
     moduleName,
     opts.format.ES,
     env ?? opts.env.PRODUCTION
   );
-  const cjsPath = genDistPath(isTopLevel, moduleName, opts.format.CJS, env);
+  const cjsPath = genDistPath(
+    isTopLevel,
+    namespace,
+    moduleName,
+    opts.format.CJS,
+    env
+  );
 
   const umdPath = genDistPath(
     isTopLevel,
+    namespace,
     moduleName,
     opts.format.UMD,
     env ?? opts.env.PRODUCTION
   );
 
-  const types = typesPath(moduleName, /* isMain */ true);
+  const types = typesPath([moduleName, namespace], /* isMain */ true);
 
   /* eslint-disable sort-keys */
   return {
@@ -185,18 +194,27 @@ function exportsOrder(moduleName, env = undefined) {
   /* eslint-enable sort-keys */
 }
 
-function genDistPath(isTopLevel, moduleName, moduleType, env) {
+// eslint-disable-next-line max-params
+function genDistPath(isTopLevel, namespace, moduleName, moduleType, env) {
   return joinPath(
     singleDot(isTopLevel),
+    levelUp(namespace),
     opts.dir.DIST,
     moduleType,
+    namespace,
     exportName(moduleName, env)
   );
 }
 
-const typesPath = (moduleName, isTopLevel) =>
+const typesPath = ([moduleName, namespace], isTopLevel) =>
   joinPath(
     singleDot(isTopLevel ?? isMain(moduleName)),
+    levelUp(namespace),
     opts.dir.TYPES,
+    namespace,
     fileName(moduleName, 'd.ts')
   );
+
+function levelUp(value) {
+  return value ? '..' : undefined;
+}

vx/config/rollup/rollup.config.cjs

@@ -60,22 +60,31 @@ function cleanupConfig(configs) {
     .map(({ input, output, plugins }) => ({ input, output, plugins }));
 }
 
-function genBaseConfig({ env, packageName, moduleName = usePackage() }) {
+function genBaseConfig({
+  env,
+  packageName,
+  moduleName = usePackage(),
+  namespace = undefined,
+}) {
   return {
     env,
     input: getInputFile(moduleName),
-    output: genOutput({ env, moduleName }),
-    plugins: getPlugins({ env, moduleName, packageName }),
+    output: genOutput({ env, moduleName, namespace }),
+    plugins: getPlugins({ env, moduleName, namespace, packageName }),
   };
 }
 
 function genExportsConfig(pkgName, env) {
-  return listExportedModules(pkgName).map(moduleName =>
-    genBaseConfig({ env, moduleName })
+  return listExportedModules(pkgName).map(([moduleName, namespace]) =>
+    genBaseConfig({ env, moduleName, namespace })
   );
 }
 
-function genOutput({ moduleName = usePackage(), env } = {}) {
+function genOutput({
+  moduleName = usePackage(),
+  env,
+  namespace = undefined,
+} = {}) {
   const base = {
     exports: 'auto',
     name: moduleName,
@@ -94,6 +103,7 @@ function genOutput({ moduleName = usePackage(), env } = {}) {
       file: vxPath.packageDist(
         usePackage(),
         format,
+        namespace,
         joinTruthy([moduleName, env, 'js'], '.')
       ),
     };
@@ -114,6 +124,7 @@ function getPlugins({
   env = opts.env.PRODUCTION,
   packageName = usePackage(),
   moduleName = packageName,
+  namespace = undefined,
 } = {}) {
   const plugins = [
     replace({
@@ -153,6 +164,7 @@ function getPlugins({
           const basePath = vxPath.package(
             usePackage(),
             opts.dir.TYPES,
+            namespace,
             moduleName + '.d.ts'
           );
 
@@ -167,7 +179,7 @@ function getPlugins({
     plugins.push(
       compiler(),
       terser(),
-      handleExports(),
+      handleExports({ namespace }),
       addModulePackageJson(),
       addCJSPackageJson()
     );

vx/util/listExportedModules.js

@@ -8,9 +8,13 @@ const vxPath = require('vx/vxPath');
 
 function listExportedModules(pkgName = usePackage()) {
   return (
-    glob
-      .sync(vxPath.packageSrc(pkgName, opts.dir.EXPORTS, '*.ts'))
-      .map(f => path.basename(f, '.ts')) ?? []
+    glob.sync(vxPath.packageSrc(pkgName, opts.dir.EXPORTS, '*.ts')).map(f => {
+      const [moduleName, namespace] = path
+        .basename(f, '.ts')
+        .split('@')
+        .reverse();
+      return [moduleName, namespace];
+    }) ?? []
   );
 }
 

vx/vxPath.js

@@ -27,7 +27,7 @@ vxPath.vxRoot = () => {
 };
 
 vxPath.package = (pkgName = usePackage(), ...args) => {
-  return path.resolve(vxPath.PACKAGES_PATH, pkgName, ...args);
+  return path.resolve(vxPath.PACKAGES_PATH, pkgName, ...args.filter(Boolean));
 };
 
 vxPath.packageDist = (pkgName = usePackage(), ...args) => {