@pasosdejesus/m 0.30.0 → 0.30.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CHANGELOG.md +14 -0
- package/dist/compose/index.d.ts +1 -1
- package/dist/compose/index.d.ts.map +1 -1
- package/dist/compose/index.js +1 -1
- package/dist/compose/index.js.map +1 -1
- package/dist/compose/vendor.d.ts +30 -1
- package/dist/compose/vendor.d.ts.map +1 -1
- package/dist/compose/vendor.js +91 -5
- package/dist/compose/vendor.js.map +1 -1
- package/package.json +1 -1
package/dist/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to `@pasosdejesus/m` are documented in this file.
|
|
4
4
|
|
|
5
|
+
## [0.30.1] - 2026-10-14
|
|
6
|
+
|
|
7
|
+
### Fixed — `eng:sync --vendor` de un motor **con vistas** (auditoría de learn.tg)
|
|
8
|
+
|
|
9
|
+
- **La copia vendorizada nace consumible:** el `package.json` **preserva los `exports` reales** del motor
|
|
10
|
+
(los subpaths `./next`/`./model` dejan de apuntar a rutas inexistentes), **puentea** los motores de los
|
|
11
|
+
que depende **por nombre** (`@pasosdejesus/<alias>` → `generated-<alias>`: sus `import` se reescriben al
|
|
12
|
+
nombre puente y se declaran como dependencia `*`, porque el nombre real es `private` y el consumidor
|
|
13
|
+
vendoriza esos motores como hermanos y añade `packages/generated/*` a su workspace; **sin** rutas
|
|
14
|
+
`file:../…`, que atarían la copia al layout de una máquina), **no** emite rangos `workspace:` (inválidos
|
|
15
|
+
fuera del workspace) y pone los peers (`react`/`react-dom`) como `peerDependencies` opcionales +
|
|
16
|
+
`devDependencies`.
|
|
17
|
+
- El `tsconfig` de la copia añade `jsx: react-jsx` y `lib` DOM, así que `tsc -b` compila motores con `.tsx`.
|
|
18
|
+
|
|
5
19
|
## [0.30.0] - 2026-10-13
|
|
6
20
|
|
|
7
21
|
### Changed (breaking) — [m/REQ/50](https://gitlab.com/pasosdeJesus/m/-/work_items/50) Fase 1
|
package/dist/compose/index.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export { deriveFrom, deriveTables, deriveColumns, deriveMigrations, deriveContra
|
|
|
12
12
|
export { discoverEngines, readEngineManifest, readIntention, readPackageJson, engineClosure, } from './discover.js';
|
|
13
13
|
export { sync } from './sync.js';
|
|
14
14
|
export { verify } from './verify.js';
|
|
15
|
-
export { vendor, unvendor, drift, readProvenance, structureSha, type Provenance, type DriftFinding, type DriftCode, type DriftReason, type GitOrigin, } from './vendor.js';
|
|
15
|
+
export { vendor, unvendor, drift, readProvenance, structureSha, enginePackages, rewriteEngineImports, type Provenance, type DriftFinding, type DriftCode, type DriftReason, type GitOrigin, } from './vendor.js';
|
|
16
16
|
export { parseFromGit, materializeGit, motorInCheckout, gitCheckoutDir, gitAvailable, gitCacheRoot, } from './git.js';
|
|
17
17
|
export { motorMigrationDir, motorMigrationFiles, planMigrationCopy, motorSeedFile, type MigrationPlan, } from './data.js';
|
|
18
18
|
export { tablesUsed, declaredUsage, usageReport, projectSources, type DeclaredUsage, type UsageReport, } from './usage.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compose/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,YAAY,EACV,SAAS,EACT,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACX,UAAU,EACV,YAAY,GACb,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,aAAa,GACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compose/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,YAAY,EACV,SAAS,EACT,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACX,UAAU,EACV,YAAY,GACb,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,aAAa,GACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAC3F,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,GACrF,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAC1F,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,aAAa,EACxE,KAAK,aAAa,GACnB,MAAM,WAAW,CAAA;AAClB,OAAO,EACL,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EACtD,KAAK,aAAa,EAAE,KAAK,WAAW,GACrC,MAAM,YAAY,CAAA"}
|
package/dist/compose/index.js
CHANGED
|
@@ -11,7 +11,7 @@ export { deriveFrom, deriveTables, deriveColumns, deriveMigrations, deriveContra
|
|
|
11
11
|
export { discoverEngines, readEngineManifest, readIntention, readPackageJson, engineClosure, } from './discover.js';
|
|
12
12
|
export { sync } from './sync.js';
|
|
13
13
|
export { verify } from './verify.js';
|
|
14
|
-
export { vendor, unvendor, drift, readProvenance, structureSha, } from './vendor.js';
|
|
14
|
+
export { vendor, unvendor, drift, readProvenance, structureSha, enginePackages, rewriteEngineImports, } from './vendor.js';
|
|
15
15
|
export { parseFromGit, materializeGit, motorInCheckout, gitCheckoutDir, gitAvailable, gitCacheRoot, } from './git.js';
|
|
16
16
|
export { motorMigrationDir, motorMigrationFiles, planMigrationCopy, motorSeedFile, } from './data.js';
|
|
17
17
|
export { tablesUsed, declaredUsage, usageReport, projectSources, } from './usage.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compose/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,OAAO,EACL,UAAU,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,aAAa,GACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compose/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,OAAO,EACL,UAAU,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,aAAa,GACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,GAE5F,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAC1F,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,aAAa,GAEzE,MAAM,WAAW,CAAA;AAClB,OAAO,EACL,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,GAEvD,MAAM,YAAY,CAAA"}
|
package/dist/compose/vendor.d.ts
CHANGED
|
@@ -36,8 +36,37 @@ export declare function structureSha(dir: string): string | null;
|
|
|
36
36
|
* consumidor (mismo criterio que sus paquetes de motor, p. ej. `gdcluster`).
|
|
37
37
|
*/
|
|
38
38
|
export declare function vendoredTsconfig(): string;
|
|
39
|
-
/**
|
|
39
|
+
/**
|
|
40
|
+
* `package.json` de la copia vendorizada: paquete propio, compilable por separado.
|
|
41
|
+
*
|
|
42
|
+
* La copia debe **nacer consumible** (auditoría de learn.tg, 2026-10-14):
|
|
43
|
+
* - **Preserva los `exports` reales del motor** (p. ej. `./next` → `dist/components/index.js`),
|
|
44
|
+
* no un `./*` genérico que rompe los subpaths.
|
|
45
|
+
* - **Puentea los motores de los que depende** por **nombre** (`generated-<alias>`): sus `import` se
|
|
46
|
+
* reescriben en la copia (ver `rewriteEngineImports`) y se declaran como dependencia `*` (el
|
|
47
|
+
* consumidor añade `packages/generated/*` a su workspace). **Sin rutas `file:../…`**: atarían la
|
|
48
|
+
* copia al layout de una máquina.
|
|
49
|
+
* - No emite rangos `workspace:`; los `peerDependencies` van como peers (opcionales) **y** como
|
|
50
|
+
* `devDependencies` para que la copia **compile**.
|
|
51
|
+
*/
|
|
40
52
|
export declare function vendoredPackageJson(motorDir: string, pkg: PackageJson | null): string;
|
|
53
|
+
/**
|
|
54
|
+
* Motores de los que depende `motorDir`, según su intención: `Map<nombre-de-paquete, alias>`.
|
|
55
|
+
* `engines.<alias>.package` da el nombre real; si falta, se asume `@pasosdejesus/<alias>`.
|
|
56
|
+
* Es la materia prima del **puente por nombre** (`rewriteEngineImports`).
|
|
57
|
+
*/
|
|
58
|
+
export declare function enginePackages(motorDir: string): Map<string, string>;
|
|
59
|
+
/**
|
|
60
|
+
* Reescribe los `import` de la copia a los motores de los que depende, **por nombre**:
|
|
61
|
+
* `@pasosdejesus/<alias>` (o el `package` declarado) → `generated-<alias>`, conservando el
|
|
62
|
+
* subpath (`@pasosdejesus/msip/model` → `generated-msip/model`). El consumidor vendoriza esos
|
|
63
|
+
* motores como hermanos en `packages/generated/*` y añade el glob a su workspace. **Sin rutas
|
|
64
|
+
* `file:../…`**: atarían la copia al layout de una máquina (auditoría de learn.tg, 2026-10-14).
|
|
65
|
+
*
|
|
66
|
+
* No toca el nombre propio del motor ni los paquetes que no declara (p. ej. `@pasosdejesus/m`,
|
|
67
|
+
* que sí es publicable).
|
|
68
|
+
*/
|
|
69
|
+
export declare function rewriteEngineImports(destDir: string, engines: Map<string, string>): void;
|
|
41
70
|
/**
|
|
42
71
|
* Motor original con el que medir el drift de una copia vendorizada: el `--from`
|
|
43
72
|
* (la carpeta del motor, o un checkout donde vive en `packages/<motor>`), y si no
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendor.d.ts","sourceRoot":"","sources":["../../src/compose/vendor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAKhF,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,sDAAsD;IACtD,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,CAAA;IACtB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,qDAAqD;IACrD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,iFAAiF;AACjF,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIvD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"vendor.d.ts","sourceRoot":"","sources":["../../src/compose/vendor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAKhF,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,mFAAmF;IACnF,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,sDAAsD;IACtD,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,CAAA;IACtB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,qDAAqD;IACrD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,iFAAiF;AACjF,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIvD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAoBzC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CA+CrF;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAMpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAqBxF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAS9G;AAED,mFAAmF;AACnF,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CA6B1F;AAED,6DAA6D;AAC7D,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAQhE;AAED,+DAA+D;AAC/D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAIhD;AAED,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAA;AAEjD,2FAA2F;AAC3F,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE9C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY,CAoBvE"}
|
package/dist/compose/vendor.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* "Porque ¿quién de vosotros, queriendo edificar una torre, no se sienta primero y calcula los gastos…?" (Lucas 14:28)
|
|
8
8
|
*/
|
|
9
|
-
import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
9
|
+
import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
10
10
|
import { createHash } from 'node:crypto';
|
|
11
11
|
import { basename, join } from 'node:path';
|
|
12
12
|
import { readIntention, readPackageJson } from './discover.js';
|
|
@@ -30,7 +30,8 @@ export function vendoredTsconfig() {
|
|
|
30
30
|
target: 'ES2022',
|
|
31
31
|
module: 'NodeNext',
|
|
32
32
|
moduleResolution: 'NodeNext',
|
|
33
|
-
lib: ['ES2022'],
|
|
33
|
+
lib: ['ES2022', 'DOM', 'DOM.Iterable'],
|
|
34
|
+
jsx: 'react-jsx',
|
|
34
35
|
rootDir: './src',
|
|
35
36
|
outDir: './dist',
|
|
36
37
|
declaration: true,
|
|
@@ -44,11 +45,41 @@ export function vendoredTsconfig() {
|
|
|
44
45
|
exclude: ['node_modules', 'dist'],
|
|
45
46
|
}, null, 2)}\n`;
|
|
46
47
|
}
|
|
47
|
-
/**
|
|
48
|
+
/**
|
|
49
|
+
* `package.json` de la copia vendorizada: paquete propio, compilable por separado.
|
|
50
|
+
*
|
|
51
|
+
* La copia debe **nacer consumible** (auditoría de learn.tg, 2026-10-14):
|
|
52
|
+
* - **Preserva los `exports` reales del motor** (p. ej. `./next` → `dist/components/index.js`),
|
|
53
|
+
* no un `./*` genérico que rompe los subpaths.
|
|
54
|
+
* - **Puentea los motores de los que depende** por **nombre** (`generated-<alias>`): sus `import` se
|
|
55
|
+
* reescriben en la copia (ver `rewriteEngineImports`) y se declaran como dependencia `*` (el
|
|
56
|
+
* consumidor añade `packages/generated/*` a su workspace). **Sin rutas `file:../…`**: atarían la
|
|
57
|
+
* copia al layout de una máquina.
|
|
58
|
+
* - No emite rangos `workspace:`; los `peerDependencies` van como peers (opcionales) **y** como
|
|
59
|
+
* `devDependencies` para que la copia **compile**.
|
|
60
|
+
*/
|
|
48
61
|
export function vendoredPackageJson(motorDir, pkg) {
|
|
49
62
|
const name = `generated-${basename(motorDir)}`;
|
|
50
63
|
const version = pkg?.version ?? '0.0.0';
|
|
51
|
-
const
|
|
64
|
+
const engines = enginePackages(motorDir);
|
|
65
|
+
const dependencies = {};
|
|
66
|
+
for (const [dep, range] of Object.entries(pkg?.dependencies ?? {})) {
|
|
67
|
+
const sibling = engines.get(dep);
|
|
68
|
+
if (sibling)
|
|
69
|
+
dependencies[`generated-${sibling}`] = '*';
|
|
70
|
+
else
|
|
71
|
+
dependencies[dep] = range.startsWith('workspace:') ? '*' : range;
|
|
72
|
+
}
|
|
73
|
+
const peerDependencies = {};
|
|
74
|
+
const peerDependenciesMeta = {};
|
|
75
|
+
const devDependencies = {};
|
|
76
|
+
for (const [dep, range] of Object.entries(pkg?.peerDependencies ?? {})) {
|
|
77
|
+
const sibling = engines.get(dep);
|
|
78
|
+
const resolved = sibling ? `generated-${sibling}` : range.startsWith('workspace:') ? '*' : range;
|
|
79
|
+
peerDependencies[dep] = resolved;
|
|
80
|
+
peerDependenciesMeta[dep] = { optional: true };
|
|
81
|
+
devDependencies[dep] = resolved;
|
|
82
|
+
}
|
|
52
83
|
const manifest = {
|
|
53
84
|
name,
|
|
54
85
|
version,
|
|
@@ -57,7 +88,7 @@ export function vendoredPackageJson(motorDir, pkg) {
|
|
|
57
88
|
description: `Copia vendorizada de ${pkg?.name ?? name} v${version}, generada por \`bin/m eng:sync --vendor\`; no editar a mano.`,
|
|
58
89
|
main: 'dist/index.js',
|
|
59
90
|
types: 'dist/index.d.ts',
|
|
60
|
-
exports: {
|
|
91
|
+
exports: pkg?.exports ?? {
|
|
61
92
|
'.': { import: './dist/index.js', types: './dist/index.d.ts' },
|
|
62
93
|
'./*': { import: './dist/*.js', types: './dist/*.d.ts' },
|
|
63
94
|
},
|
|
@@ -69,8 +100,61 @@ export function vendoredPackageJson(motorDir, pkg) {
|
|
|
69
100
|
};
|
|
70
101
|
if (Object.keys(dependencies).length > 0)
|
|
71
102
|
manifest.dependencies = dependencies;
|
|
103
|
+
if (Object.keys(peerDependencies).length > 0) {
|
|
104
|
+
manifest.peerDependencies = peerDependencies;
|
|
105
|
+
manifest.peerDependenciesMeta = peerDependenciesMeta;
|
|
106
|
+
}
|
|
107
|
+
if (Object.keys(devDependencies).length > 0)
|
|
108
|
+
manifest.devDependencies = devDependencies;
|
|
72
109
|
return `${JSON.stringify(manifest, null, 2)}\n`;
|
|
73
110
|
}
|
|
111
|
+
/**
|
|
112
|
+
* Motores de los que depende `motorDir`, según su intención: `Map<nombre-de-paquete, alias>`.
|
|
113
|
+
* `engines.<alias>.package` da el nombre real; si falta, se asume `@pasosdejesus/<alias>`.
|
|
114
|
+
* Es la materia prima del **puente por nombre** (`rewriteEngineImports`).
|
|
115
|
+
*/
|
|
116
|
+
export function enginePackages(motorDir) {
|
|
117
|
+
const map = new Map();
|
|
118
|
+
for (const [alias, ref] of Object.entries(readIntention(motorDir)?.engines ?? {})) {
|
|
119
|
+
map.set(ref.package ?? `@pasosdejesus/${alias}`, alias);
|
|
120
|
+
}
|
|
121
|
+
return map;
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Reescribe los `import` de la copia a los motores de los que depende, **por nombre**:
|
|
125
|
+
* `@pasosdejesus/<alias>` (o el `package` declarado) → `generated-<alias>`, conservando el
|
|
126
|
+
* subpath (`@pasosdejesus/msip/model` → `generated-msip/model`). El consumidor vendoriza esos
|
|
127
|
+
* motores como hermanos en `packages/generated/*` y añade el glob a su workspace. **Sin rutas
|
|
128
|
+
* `file:../…`**: atarían la copia al layout de una máquina (auditoría de learn.tg, 2026-10-14).
|
|
129
|
+
*
|
|
130
|
+
* No toca el nombre propio del motor ni los paquetes que no declara (p. ej. `@pasosdejesus/m`,
|
|
131
|
+
* que sí es publicable).
|
|
132
|
+
*/
|
|
133
|
+
export function rewriteEngineImports(destDir, engines) {
|
|
134
|
+
if (engines.size === 0 || !existsSync(destDir))
|
|
135
|
+
return;
|
|
136
|
+
const pairs = [...engines.entries()].map(([name, alias]) => [name, `generated-${alias}`]);
|
|
137
|
+
const walk = (dir) => {
|
|
138
|
+
for (const entry of readdirSync(dir, { withFileTypes: true })) {
|
|
139
|
+
const full = join(dir, entry.name);
|
|
140
|
+
if (entry.isDirectory()) {
|
|
141
|
+
walk(full);
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
if (!/\.tsx?$/.test(entry.name))
|
|
145
|
+
continue;
|
|
146
|
+
const source = readFileSync(full, 'utf-8');
|
|
147
|
+
let rewritten = source;
|
|
148
|
+
for (const [from, to] of pairs) {
|
|
149
|
+
const escaped = from.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
150
|
+
rewritten = rewritten.replace(new RegExp(`(['"\`])${escaped}(?=[/'"\`])`, 'g'), `$1${to}`);
|
|
151
|
+
}
|
|
152
|
+
if (rewritten !== source)
|
|
153
|
+
writeFileSync(full, rewritten);
|
|
154
|
+
}
|
|
155
|
+
};
|
|
156
|
+
walk(destDir);
|
|
157
|
+
}
|
|
74
158
|
/**
|
|
75
159
|
* Motor original con el que medir el drift de una copia vendorizada: el `--from`
|
|
76
160
|
* (la carpeta del motor, o un checkout donde vive en `packages/<motor>`), y si no
|
|
@@ -101,6 +185,8 @@ export function vendor(motorDir, outDir, gitOrigin) {
|
|
|
101
185
|
if (existsSync(from))
|
|
102
186
|
cpSync(from, join(outDir, entry), { recursive: true, filter: keep });
|
|
103
187
|
}
|
|
188
|
+
// Puente por nombre: la copia importa `generated-<alias>`, no `@pasosdejesus/<alias>` (private).
|
|
189
|
+
rewriteEngineImports(join(outDir, 'src'), enginePackages(motorDir));
|
|
104
190
|
// Paquete propio + tsconfig autónomo: cada copia se compila por separado (`tsc -b`).
|
|
105
191
|
writeFileSync(join(outDir, 'package.json'), vendoredPackageJson(motorDir, pkg));
|
|
106
192
|
writeFileSync(join(outDir, 'tsconfig.json'), vendoredTsconfig());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../src/compose/vendor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../src/compose/vendor.ts"],"names":[],"mappings":"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"}
|