piral-core 1.0.2 → 1.1.0-beta.5756

package/src/tools/codegen.ts

@@ -1,12 +1,42 @@
 // this file is bundled, so the references here will not be at runtime (i.e., for a user)
 import { getModulePath } from 'piral-cli/src/external/resolve';
+import { readFileSync, existsSync } from 'fs';
+import { resolve, dirname } from 'path';
+
+function findPackagePath(moduleDir: string) {
+  const packageJson = 'package.json';
+  const packagePath = resolve(moduleDir, packageJson);
+
+  if (existsSync(packagePath)) {
+    return packagePath;
+  }
+
+  const newDir = resolve(moduleDir, '..');
+
+  if (newDir !== moduleDir) {
+    return findPackagePath(newDir);
+  }
+
+  return undefined;
+}
+
+function getPackageJson(root: string, packageName: string) {
+  const moduleDir = dirname(getModulePath(root, packageName));
+
+  try {
+    const packagePath = findPackagePath(moduleDir);
+    const content = readFileSync(packagePath, 'utf8');
+    return JSON.parse(content) || {};
+  } catch {
+    return {};
+  }
+}
 
 function getRouterVersion(root: string) {
   const router = 'react-router';
 
   try {
-    const modulePath = getModulePath(root, `${router}/package.json`);
-    const { version } = require(modulePath);
+    const { version } = getPackageJson(root, router);
     const [major] = version.split('.');
     return parseInt(major, 10);
   } catch {
@@ -16,17 +46,15 @@ function getRouterVersion(root: string) {
 }
 
 function getIdentifiers(root: string, packageName: string) {
-  const packageJson = `${packageName}/package.json`;
   const identifiers = [packageName];
 
   try {
-    const modulePath = getModulePath(root, packageJson);
-    const details = require(modulePath);
+    const details = getPackageJson(root, packageName);
 
     if (details.version) {
       identifiers.push(`${packageName}@${details.version}`);
 
-      if (details.name !== packageName) {
+      if (details.name && details.name !== packageName) {
         identifiers.push(`${details.name}@${details.version}`);
       }
     }
@@ -63,22 +91,40 @@ interface CodegenOptions {
 export function createDependencies(imports: Array<string>, exports: Array<string>, opts: CodegenOptions) {
   const { root, appName, externals } = opts;
   const assignments: Array<string> = [];
+  const asyncAssignments: Array<string> = [];
 
   if (appName) {
     assignments.push(`deps['${appName}']={}`);
   }
 
-  for (const name of externals) {
-    const identifiers = getIdentifiers(root, name);
-    const path = getModulePathOrDefault(root, name);
-    const ref = `_${imports.length}`;
-    imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
+  for (const external of externals) {
+    if (external.endsWith('?')) {
+      const name = external.replace(/\?+$/, '');
+      const identifiers = getIdentifiers(root, name);
+      const path = getModulePathOrDefault(root, name);
 
-    for (const id of identifiers) {
-      assignments.push(`deps[${JSON.stringify(id)}]=${ref}`);
+      for (const id of identifiers) {
+        asyncAssignments.push(`registerModule(${JSON.stringify(id)}, () => import(${JSON.stringify(path)}))`);
+      }
+    } else {
+      const name = external;
+      const identifiers = getIdentifiers(root, name);
+      const path = getModulePathOrDefault(root, name);
+      const ref = `_${imports.length}`;
+      imports.push(`import * as ${ref} from ${JSON.stringify(path)}`);
+
+      for (const id of identifiers) {
+        assignments.push(`deps[${JSON.stringify(id)}]=${ref}`);
+      }
     }
   }
 
+  if (asyncAssignments.length) {
+    imports.push(`import { registerModule } from 'piral-base'`);
+    assignments.push(...asyncAssignments);
+
+  }
+
   exports.push(`
     export function fillDependencies(deps) {
       ${assignments.join(';')}

package/src/types/navigation.ts

@@ -98,4 +98,8 @@ export interface NavigationApi {
    * as the implementation is router specific and may change over time.
    */
   router: any;
+  /**
+   * Gets the public path of the application.
+   */
+  publicPath: string;
 }

package/esm/hooks/routes.d.ts

@@ -1,2 +0,0 @@
-import { AppPath } from '../types';
-export declare function useRoutes(): AppPath[];

package/esm/hooks/routes.js

@@ -1,11 +0,0 @@
-import { useGlobalState } from './globalState';
-import { useRouteFilter } from '../../app.codegen';
-export function useRoutes() {
-    const routes = useGlobalState((s) => s.routes);
-    const pages = useGlobalState((s) => s.registry.pages);
-    const paths = [];
-    Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-    Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-    return useRouteFilter(paths);
-}
-//# sourceMappingURL=routes.js.map

package/esm/hooks/routes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/hooks/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,UAAU,SAAS;IACvB,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,KAAK,GAAmB,EAAE,CAAC;IAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEzF,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC"}

package/lib/hooks/routes.d.ts

@@ -1,2 +0,0 @@
-import { AppPath } from '../types';
-export declare function useRoutes(): AppPath[];

package/lib/hooks/routes.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useRoutes = void 0;
-const globalState_1 = require("./globalState");
-const app_codegen_1 = require("../../app.codegen");
-function useRoutes() {
-    const routes = (0, globalState_1.useGlobalState)((s) => s.routes);
-    const pages = (0, globalState_1.useGlobalState)((s) => s.registry.pages);
-    const paths = [];
-    Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-    Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-    return (0, app_codegen_1.useRouteFilter)(paths);
-}
-exports.useRoutes = useRoutes;
-//# sourceMappingURL=routes.js.map

package/lib/hooks/routes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/hooks/routes.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,mDAAmD;AAGnD,SAAgB,SAAS;IACvB,MAAM,MAAM,GAAG,IAAA,4BAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAA,4BAAc,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,KAAK,GAAmB,EAAE,CAAC;IAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEzF,OAAO,IAAA,4BAAc,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AATD,8BASC"}

package/src/hooks/routes.ts

@@ -1,14 +0,0 @@
-import { useGlobalState } from './globalState';
-import { useRouteFilter } from '../../app.codegen';
-import { AppPath } from '../types';
-
-export function useRoutes() {
-  const routes = useGlobalState((s) => s.routes);
-  const pages = useGlobalState((s) => s.registry.pages);
-  const paths: Array<AppPath> = [];
-
-  Object.keys(routes).map((path) => paths.push({ path, Component: routes[path] }));
-  Object.keys(pages).map((path) => paths.push({ path, Component: pages[path].component }));
-
-  return useRouteFilter(paths);
-}