@ojiepermana/angular 21.1.16 → 21.1.18

package/etos/styles/index.css

@@ -1,15 +1,7 @@
 /**
- * @ojiepermana/angular/etos — complete Etos brand stylesheet.
+ * Compatibility entry for consumers that resolve the explicit index file.
  *
- * Import before Tailwind, then import the shared Tailwind token bridge.
+ * Keep this publish-safe because ng-packagr copies it verbatim to
+ * `@ojiepermana/angular/etos/styles/index.css`.
  */
-@import '../../../theme/src/lib/styles/themes/library/_layers.css';
-@import '../../../theme/src/lib/styles/themes/mode/index.css';
-@import '../../../theme/src/lib/styles/themes/library/color/index.css';
-@import '../../../theme/src/lib/styles/themes/library/style/index.css';
-@import './color.css';
-@import './style.css';
-@import './layout.css';
-@import '../../../theme/src/lib/styles/themes/library/_tokens.css';
-@import '../../../theme/src/lib/styles/themes/library/_material-overrides.css';
-@import '../../../theme/src/lib/styles/themes/library/_components.css';
+@import './package.css';

package/etos/styles/package.css

@@ -0,0 +1,15 @@
+/**
+ * @ojiepermana/angular/etos — published Etos brand stylesheet.
+ *
+ * Import before Tailwind, then import the shared Tailwind token bridge.
+ */
+@import '@ojiepermana/angular/theme/styles/themes/library/_layers.css';
+@import '@ojiepermana/angular/theme/styles/themes/mode/index.css';
+@import '@ojiepermana/angular/theme/styles/themes/library/color/index.css';
+@import '@ojiepermana/angular/theme/styles/themes/library/style/index.css';
+@import './color.css';
+@import './style.css';
+@import './layout.css';
+@import '@ojiepermana/angular/theme/styles/themes/library/_tokens.css';
+@import '@ojiepermana/angular/theme/styles/themes/library/_material-overrides.css';
+@import '@ojiepermana/angular/theme/styles/themes/library/_components.css';

package/generator/api/bin/src/engine.js

@@ -38,8 +38,8 @@ async function generate(target, workspaceRoot) {
     // public-api barrel is emitted last so it sees the final feature set.
     files.push(...(0, public_api_1.emitPublicApi)(ir, target));
     const laidOut = target.splitByDomain ? (0, per_domain_1.relayoutPerDomain)(files, ir, target) : files;
-    const wrapped = applyMode(laidOut, ir, target);
     const outputDir = (0, node_path_1.isAbsolute)(target.output) ? target.output : (0, node_path_1.resolve)(workspaceRoot, target.output);
+    const wrapped = applyMode(laidOut, ir, target, workspaceRoot, outputDir);
     return {
         target,
         outputDir,
@@ -52,12 +52,12 @@ async function generate(target, workspaceRoot) {
         },
     };
 }
-function applyMode(files, ir, target) {
+function applyMode(files, ir, target, workspaceRoot, outputDir) {
     switch (target.mode) {
         case 'library':
-            return (0, index_1.writeLibrary)(files, ir, target);
+            return (0, index_1.writeLibrary)(files, ir, target, workspaceRoot, outputDir);
         case 'secondary-entrypoint':
-            return (0, index_1.writeSecondaryEntrypoint)(files, ir, target);
+            return (0, index_1.writeSecondaryEntrypoint)(files, ir, target, workspaceRoot, outputDir);
         case 'standalone':
         default:
             return (0, index_1.writeStandalone)(files);

package/generator/api/bin/src/layout/per-domain.js

@@ -293,7 +293,7 @@ function emitPublicApis(ir, target, mapping) {
     }
     if (target.features.metadata) {
         sharedLines.push(`export * from './metadata-types';`);
-        sharedLines.push(`export * from './validators';`);
+        sharedLines.push(`export * from './validators/index';`);
         sharedLines.push('');
     }
     if (target.features.navigation) {
@@ -303,16 +303,9 @@ function emitPublicApis(ir, target, mapping) {
     // Per-domain public-api.ts.
     for (const domain of mapping.domains) {
         const lines = [target.banner, ''];
-        // Re-export shared namespace for convenience. `domain` may be nested
-        // (e.g. `storage/gcs`), so compute the relative path instead of
-        // hard-coding `../shared/public-api`.
-        const domainDir = node_path_1.posix.join(VIRTUAL_ROOT, domain);
-        const sharedTarget = node_path_1.posix.join(VIRTUAL_ROOT, SHARED, 'public-api');
-        let sharedSpec = node_path_1.posix.relative(domainDir, sharedTarget);
-        if (!sharedSpec.startsWith('.'))
-            sharedSpec = `./${sharedSpec}`;
-        lines.push(`export * from '${sharedSpec}';`);
-        lines.push('');
+        // Keep each domain entrypoint scoped to its own surface. Re-exporting the
+        // shared barrel here makes the root barrel publish the same names twice
+        // once it also exports `./shared/public-api`.
         if (target.features.models) {
             const ownedModels = schemaNames.filter((n) => mapping.modelOwner.get(n) === domain);
             for (const name of ownedModels) {
@@ -321,6 +314,14 @@ function emitPublicApis(ir, target, mapping) {
             if (ownedModels.length)
                 lines.push('');
         }
+        if (target.features.metadata) {
+            const tags = (mapping.domainServices.get(domain) ?? []).slice().sort();
+            for (const tag of tags) {
+                lines.push(`export { ${(0, template_1.camelCase)(tag)}OperationRules } from './permissions/${(0, template_1.kebabCase)(tag)}';`);
+            }
+            if (tags.length)
+                lines.push('');
+        }
         if (target.features.services) {
             const tags = mapping.domainServices.get(domain) ?? [];
             for (const tag of tags.sort()) {

package/generator/api/bin/src/writer/index.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeStandalone = writeStandalone;
 exports.writeLibrary = writeLibrary;
 exports.writeSecondaryEntrypoint = writeSecondaryEntrypoint;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const template_1 = require("../render/template");
+const ROOT_ENTRYPOINT = '';
+const VIRTUAL_ROOT = '/__sdk__';
 /**
  * No-op writer for the standalone mode — returns emitted files unchanged. Kept
  * as a named function so modes are composable from a single switch at the
@@ -16,10 +20,11 @@ function writeStandalone(files) {
  * Library mode: add `ng-package.json`, `package.json`, and a top-level README
  * so the `output` folder can be built with ng-packagr directly.
  */
-function writeLibrary(files, ir, target) {
+function writeLibrary(files, ir, target, workspaceRoot, outputDir) {
+    const normalizedFiles = rewriteCrossEntrypointImports(files, target, workspaceRoot, outputDir);
     const ngPackage = {
-        $schema: '../../node_modules/ng-packagr/ng-package.schema.json',
-        dest: `../dist/${target.packageName.replace(/^@/, '').replace(/\//g, '-')}`,
+        $schema: toPosixPath((0, node_path_1.relative)(outputDir, (0, node_path_1.resolve)(workspaceRoot, 'node_modules/ng-packagr/ng-package.schema.json'))),
+        dest: toPosixPath((0, node_path_1.relative)(outputDir, (0, node_path_1.resolve)(workspaceRoot, 'dist', packageSlug(target.packageName)))),
         lib: { entryFile: 'public-api.ts' },
     };
     const pkg = {
@@ -34,9 +39,9 @@ function writeLibrary(files, ir, target) {
         sideEffects: false,
     };
     return [
-        ...files,
+        ...normalizedFiles,
         createNgPackageFile('ng-package.json', ngPackage),
-        ...createNestedEntrypointNgPackages(files),
+        ...createNestedEntrypointNgPackages(normalizedFiles),
         {
             path: 'package.json',
             content: (0, template_1.finalize)(JSON.stringify(pkg, null, 2)),
@@ -53,11 +58,154 @@ function writeLibrary(files, ir, target) {
  * existing library (e.g. `projects/angular/sdk-api/`) so ng-packagr picks it
  * up automatically as a secondary entrypoint of the parent library.
  */
-function writeSecondaryEntrypoint(files, _ir, _target) {
+function writeSecondaryEntrypoint(files, _ir, target, workspaceRoot, outputDir) {
+    const normalizedFiles = rewriteCrossEntrypointImports(files, target, workspaceRoot, outputDir);
     const ngPackage = {
         lib: { entryFile: 'public-api.ts' },
     };
-    return [...files, createNgPackageFile('ng-package.json', ngPackage), ...createNestedEntrypointNgPackages(files)];
+    return [
+        ...normalizedFiles,
+        createNgPackageFile('ng-package.json', ngPackage),
+        ...createNestedEntrypointNgPackages(normalizedFiles),
+    ];
+}
+function rewriteCrossEntrypointImports(files, target, workspaceRoot, outputDir) {
+    const entrypointDirs = collectEntrypointDirs(files);
+    if (entrypointDirs.length <= 1) {
+        return [...files];
+    }
+    const packageImportBase = resolvePackageImportBase(target, workspaceRoot, outputDir);
+    if (!packageImportBase) {
+        return [...files];
+    }
+    const knownFiles = new Set(files.map((file) => file.path));
+    return files.map((file) => {
+        const owner = findEntrypointOwner(file.path, entrypointDirs);
+        if (owner === ROOT_ENTRYPOINT) {
+            return file;
+        }
+        return {
+            ...file,
+            content: file.content.replace(/(from\s+['"])([^'"]+)(['"])/g, (_match, prefix, spec, suffix) => {
+                const nextSpec = rewriteModuleSpecifier(spec, file.path, owner, entrypointDirs, knownFiles, packageImportBase);
+                return `${prefix}${nextSpec}${suffix}`;
+            }),
+        };
+    });
+}
+function rewriteModuleSpecifier(specifier, currentPath, currentOwner, entrypointDirs, knownFiles, packageImportBase) {
+    if (!specifier.startsWith('./') && !specifier.startsWith('../')) {
+        return specifier;
+    }
+    const targetPath = resolveVirtualFilePath(currentPath, specifier, knownFiles);
+    if (!targetPath) {
+        return specifier;
+    }
+    const targetOwner = findEntrypointOwner(targetPath, entrypointDirs);
+    if (targetOwner === currentOwner) {
+        return specifier;
+    }
+    return buildEntrypointImport(packageImportBase, targetOwner);
+}
+function resolveVirtualFilePath(currentPath, specifier, knownFiles) {
+    const currentAbs = node_path_1.posix.join(VIRTUAL_ROOT, currentPath);
+    const resolved = node_path_1.posix.normalize(node_path_1.posix.join((0, node_path_1.dirname)(currentAbs), specifier));
+    const candidates = [`${resolved}.ts`, `${resolved}/index.ts`, `${resolved}/public-api.ts`, resolved];
+    for (const candidate of candidates) {
+        if (!candidate.startsWith(`${VIRTUAL_ROOT}/`)) {
+            continue;
+        }
+        const relativePath = candidate.slice(VIRTUAL_ROOT.length + 1);
+        if (knownFiles.has(relativePath)) {
+            return relativePath;
+        }
+    }
+    return undefined;
+}
+function resolvePackageImportBase(target, workspaceRoot, outputDir) {
+    if (target.mode === 'library') {
+        return target.packageName;
+    }
+    if (target.mode !== 'secondary-entrypoint') {
+        return '';
+    }
+    return inferSecondaryEntrypointPackageName(workspaceRoot, outputDir, target.packageName);
+}
+function inferSecondaryEntrypointPackageName(workspaceRoot, outputDir, fallback) {
+    let currentDir = outputDir;
+    let nearestPackageDir;
+    let nearestPackagrDir;
+    while (isWithinWorkspace(currentDir, workspaceRoot)) {
+        const packageJsonPath = (0, node_path_1.resolve)(currentDir, 'package.json');
+        if ((0, node_fs_1.existsSync)(packageJsonPath)) {
+            nearestPackageDir ??= currentDir;
+            if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(currentDir, 'ng-package.json'))) {
+                nearestPackagrDir = currentDir;
+                break;
+            }
+        }
+        if (currentDir === workspaceRoot) {
+            break;
+        }
+        const parentDir = (0, node_path_1.dirname)(currentDir);
+        if (parentDir === currentDir) {
+            break;
+        }
+        currentDir = parentDir;
+    }
+    const packageDir = nearestPackagrDir ?? nearestPackageDir;
+    if (!packageDir) {
+        return fallback;
+    }
+    const packageName = readPackageName(packageDir);
+    if (!packageName) {
+        return fallback;
+    }
+    const relativeOutput = toPosixPath((0, node_path_1.relative)(packageDir, outputDir)).replace(/^\.\//, '');
+    if (!relativeOutput || relativeOutput === '.') {
+        return packageName;
+    }
+    return `${packageName}/${relativeOutput}`;
+}
+function readPackageName(packageDir) {
+    const packageJsonPath = (0, node_path_1.resolve)(packageDir, 'package.json');
+    if (!(0, node_fs_1.existsSync)(packageJsonPath)) {
+        return undefined;
+    }
+    const raw = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf8'));
+    return typeof raw.name === 'string' && raw.name.length > 0 ? raw.name : undefined;
+}
+function isWithinWorkspace(candidate, workspaceRoot) {
+    const rel = (0, node_path_1.relative)(workspaceRoot, candidate);
+    return rel === '' || (!rel.startsWith('..') && !(0, node_path_1.isAbsolute)(rel));
+}
+function collectEntrypointDirs(files) {
+    const dirs = new Set();
+    for (const file of files) {
+        if (file.path === 'public-api.ts') {
+            dirs.add(ROOT_ENTRYPOINT);
+            continue;
+        }
+        if (!file.path.endsWith('/public-api.ts')) {
+            continue;
+        }
+        dirs.add(file.path.slice(0, -'/public-api.ts'.length));
+    }
+    return [...dirs].sort((left, right) => right.length - left.length || left.localeCompare(right));
+}
+function findEntrypointOwner(filePath, entrypointDirs) {
+    for (const entrypointDir of entrypointDirs) {
+        if (entrypointDir === ROOT_ENTRYPOINT) {
+            continue;
+        }
+        if (filePath === `${entrypointDir}/public-api.ts` || filePath.startsWith(`${entrypointDir}/`)) {
+            return entrypointDir;
+        }
+    }
+    return ROOT_ENTRYPOINT;
+}
+function buildEntrypointImport(packageImportBase, entrypointDir) {
+    return entrypointDir ? `${packageImportBase}/${entrypointDir}` : packageImportBase;
 }
 function createNestedEntrypointNgPackages(files) {
     return collectSecondaryEntrypointDirs(files).map((dir) => createNgPackageFile(`${dir}/ng-package.json`, {
@@ -74,6 +222,12 @@ function collectSecondaryEntrypointDirs(files) {
     }
     return [...dirs].sort();
 }
+function packageSlug(packageName) {
+    return packageName.replace(/^@/, '').replace(/\//g, '-');
+}
+function toPosixPath(value) {
+    return value.split('\\').join('/');
+}
 function createNgPackageFile(path, content) {
     return {
         path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ojiepermana/angular",
-  "version": "21.1.16",
+  "version": "21.1.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ojiepermana/angular.git"
@@ -65,11 +65,11 @@
   "sideEffects": false,
   "schematics": "./collection.json",
   "exports": {
-    "./etos/styles": "./etos/styles/index.css",
+    "./etos/styles": "./etos/styles/package.css",
     "./etos/styles/*": "./etos/styles/*",
     "./theme/styles": "./theme/styles/index.css",
     "./theme/styles/*": "./theme/styles/*",
-    "./theme/tailwind/theme.css": "./theme/styles/themes/taildwind.css",
+    "./theme/tailwind/theme.css": "./theme/styles/themes/tailwind.css",
     "./package.json": {
       "default": "./package.json"
     },

package/theme/styles/etos.css

@@ -3,4 +3,4 @@
  *
  * The Etos implementation now lives under the dedicated `./etos` entrypoint.
  */
-@import '../../../../brand/etos/themes/index.css';
+@import '@ojiepermana/angular/etos/styles';

package/theme/styles/themes/{taildwind.css → tailwind.css}

@@ -109,4 +109,4 @@
 
   --font-sans: var(--theme-font-sans);
   --font-mono: var(--theme-font-mono);
-}
+}