@memberjunction/open-app-engine 5.7.0 → 5.9.0

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.
Files changed (27) hide show
  1. package/dist/index.d.ts +2 -2
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +1 -1
  4. package/dist/index.js.map +1 -1
  5. package/dist/install/client-bootstrap-gen.d.ts +1 -1
  6. package/dist/install/client-bootstrap-gen.d.ts.map +1 -1
  7. package/dist/install/client-bootstrap-gen.js +5 -2
  8. package/dist/install/client-bootstrap-gen.js.map +1 -1
  9. package/dist/install/config-manager.d.ts.map +1 -1
  10. package/dist/install/config-manager.js +18 -4
  11. package/dist/install/config-manager.js.map +1 -1
  12. package/dist/install/install-orchestrator.d.ts +7 -0
  13. package/dist/install/install-orchestrator.d.ts.map +1 -1
  14. package/dist/install/install-orchestrator.js +22 -12
  15. package/dist/install/install-orchestrator.js.map +1 -1
  16. package/dist/install/migration-runner.d.ts +3 -0
  17. package/dist/install/migration-runner.d.ts.map +1 -1
  18. package/dist/install/migration-runner.js +6 -1
  19. package/dist/install/migration-runner.js.map +1 -1
  20. package/dist/install/package-manager.d.ts +14 -0
  21. package/dist/install/package-manager.d.ts.map +1 -1
  22. package/dist/install/package-manager.js +98 -27
  23. package/dist/install/package-manager.js.map +1 -1
  24. package/dist/install/schema-manager.d.ts.map +1 -1
  25. package/dist/install/schema-manager.js +21 -21
  26. package/dist/install/schema-manager.js.map +1 -1
  27. package/package.json +3 -3
package/dist/index.d.ts CHANGED
@@ -13,8 +13,8 @@ export { CreateAppSchema, DropAppSchema, SchemaExists, ValidateSchemaName, Escap
13
13
  export type { SchemaOperationResult } from './install/schema-manager.js';
14
14
  export { RunAppMigrations } from './install/migration-runner.js';
15
15
  export type { MigrationRunOptions, MigrationRunResult, FlywayDatabaseConfig, SkywayDatabaseConfig } from './install/migration-runner.js';
16
- export { AddAppPackages, RemoveAppPackages, RunNpmInstall } from './install/package-manager.js';
17
- export type { PackageManagerOptions, PackageOperationResult } from './install/package-manager.js';
16
+ export { AddAppPackages, RemoveAppPackages, RunNpmInstall, RunPackageInstall, detectPackageManager, hasPnpmCatalog } from './install/package-manager.js';
17
+ export type { PackageManagerOptions, PackageOperationResult, PackageManagerType, VersionStrategy, WorkspaceTarget } from './install/package-manager.js';
18
18
  export { AddServerDynamicPackages, RemoveServerDynamicPackages, ToggleServerDynamicPackages } from './install/config-manager.js';
19
19
  export type { DynamicPackageEntry, ConfigOperationResult } from './install/config-manager.js';
20
20
  export { RegenerateClientBootstrap } from './install/client-bootstrap-gen.js';
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvH,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,YAAY,EACR,SAAS,EACT,aAAa,EACb,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,YAAY,EACR,cAAc,EACd,eAAe,EACf,0BAA0B,EAC1B,eAAe,EAClB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACH,2BAA2B,EAC3B,mCAAmC,EACnC,cAAc,EACjB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACjB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACR,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EAC1B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChI,YAAY,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAEzI,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAChG,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAElG,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,YAAY,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,OAAO,EACH,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EACH,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,EACZ,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvH,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,YAAY,EACR,SAAS,EACT,aAAa,EACb,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,YAAY,EACR,cAAc,EACd,eAAe,EACf,0BAA0B,EAC1B,eAAe,EAClB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACH,2BAA2B,EAC3B,mCAAmC,EACnC,cAAc,EACjB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACjB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACR,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EAC1B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChI,YAAY,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAEzI,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzJ,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAExJ,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,YAAY,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,OAAO,EACH,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EACH,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,EACZ,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}
package/dist/index.js CHANGED
@@ -5,7 +5,7 @@ export { CheckMJVersionCompatibility, CheckDependencyVersionCompatibility, IsVal
5
5
  export { FetchManifestFromGitHub, ListGitHubReleases, DownloadMigrations, GetLatestVersion, ParseGitHubUrl } from './github/github-client.js';
6
6
  export { CreateAppSchema, DropAppSchema, SchemaExists, ValidateSchemaName, EscapeSqlString } from './install/schema-manager.js';
7
7
  export { RunAppMigrations } from './install/migration-runner.js';
8
- export { AddAppPackages, RemoveAppPackages, RunNpmInstall } from './install/package-manager.js';
8
+ export { AddAppPackages, RemoveAppPackages, RunNpmInstall, RunPackageInstall, detectPackageManager, hasPnpmCatalog } from './install/package-manager.js';
9
9
  export { AddServerDynamicPackages, RemoveServerDynamicPackages, ToggleServerDynamicPackages } from './install/config-manager.js';
10
10
  export { RegenerateClientBootstrap } from './install/client-bootstrap-gen.js';
11
11
  export { RecordAppInstallation, UpdateAppRecord, SetAppStatus, RecordInstallHistoryEntry, RecordAppDependencies, DeleteAppDependencies, FindInstalledApp, ListInstalledApps, FindDependentApps } from './install/history-recorder.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAmBvH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAO1E,OAAO,EACH,2BAA2B,EAC3B,mCAAmC,EACnC,cAAc,EACjB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACjB,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGhI,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGhG,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAG9E,OAAO,EACH,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EACH,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,EACZ,MAAM,mCAAmC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAmBvH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAO1E,OAAO,EACH,2BAA2B,EAC3B,mCAAmC,EACnC,cAAc,EACjB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACjB,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGhI,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGzJ,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAG9E,OAAO,EACH,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EACH,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,EACZ,MAAM,mCAAmC,CAAC"}
package/dist/install/client-bootstrap-gen.d.ts CHANGED
@@ -4,5 +4,5 @@ export interface ClientBootstrapEntry {
4
4
  PackageName: string;
5
5
  Enabled: boolean;
6
6
  }
7
- export declare function RegenerateClientBootstrap(repoRoot: string, entries: ClientBootstrapEntry[]): void;
7
+ export declare function RegenerateClientBootstrap(repoRoot: string, entries: ClientBootstrapEntry[], clientPackagePath?: string, bootstrapSubpath?: string): void;
8
8
  //# sourceMappingURL=client-bootstrap-gen.d.ts.map
package/dist/install/client-bootstrap-gen.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client-bootstrap-gen.d.ts","sourceRoot":"","sources":["../../src/install/client-bootstrap-gen.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,oBAAoB;IAEjC,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,MAAM,CAAC;IAEhB,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,OAAO,CAAC;CACpB;AAYD,wBAAgB,yBAAyB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,oBAAoB,EAAE,GAChC,IAAI,CAQN"}
1
+ {"version":3,"file":"client-bootstrap-gen.d.ts","sourceRoot":"","sources":["../../src/install/client-bootstrap-gen.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,oBAAoB;IAEjC,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,MAAM,CAAC;IAEhB,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,OAAO,CAAC;CACpB;AAiBD,wBAAgB,yBAAyB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,oBAAoB,EAAE,EAC/B,iBAAiB,CAAC,EAAE,MAAM,EAC1B,gBAAgB,CAAC,EAAE,MAAM,GAC1B,IAAI,CAON"}
package/dist/install/client-bootstrap-gen.js CHANGED
@@ -1,7 +1,10 @@
1
1
  import { writeFileSync } from 'node:fs';
2
2
  import { resolve } from 'node:path';
3
- export function RegenerateClientBootstrap(repoRoot, entries) {
4
- const filePath = resolve(repoRoot, 'packages/MJExplorer/src/app/generated/open-app-bootstrap.generated.ts');
3
+ const DEFAULT_BOOTSTRAP_SUBPATH = 'src/app/generated/open-app-bootstrap.generated.ts';
4
+ export function RegenerateClientBootstrap(repoRoot, entries, clientPackagePath, bootstrapSubpath) {
5
+ const basePath = clientPackagePath ?? 'packages/MJExplorer';
6
+ const subPath = bootstrapSubpath ?? DEFAULT_BOOTSTRAP_SUBPATH;
7
+ const filePath = resolve(repoRoot, basePath, subPath);
5
8
  const content = BuildBootstrapFileContent(entries);
6
9
  writeFileSync(filePath, content, 'utf-8');
7
10
  }
package/dist/install/client-bootstrap-gen.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client-bootstrap-gen.js","sourceRoot":"","sources":["../../src/install/client-bootstrap-gen.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC,MAAM,UAAU,yBAAyB,CACrC,QAAgB,EAChB,OAA+B;IAE/B,MAAM,QAAQ,GAAG,OAAO,CACpB,QAAQ,EACR,uEAAuE,CAC1E,CAAC;IAEF,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACnD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAKD,SAAS,yBAAyB,CAAC,OAA+B;IAC9D,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,GAAG,+BAA+B,CAAC;IACpD,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,OAAO,MAAM,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,CAAC;AAC9C,CAAC;AAKD,SAAS,eAAe;IACpB,OAAO;;;;;;;gBAOK,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;;CAEvC,CAAC;AACF,CAAC;AAKD,SAAS,eAAe,CAAC,KAA2B;IAChD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,MAAM,KAAK,CAAC,OAAO,GAAG,CAAC;IAE1D,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,GAAG,OAAO,aAAa,KAAK,CAAC,WAAW,MAAM,CAAC;IAC1D,CAAC;IAED,OAAO,GAAG,OAAO,2BAA2B,KAAK,CAAC,WAAW,MAAM,CAAC;AACxE,CAAC"}
1
+ {"version":3,"file":"client-bootstrap-gen.js","sourceRoot":"","sources":["../../src/install/client-bootstrap-gen.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,MAAM,yBAAyB,GAAG,mDAAmD,CAAC;AActF,MAAM,UAAU,yBAAyB,CACrC,QAAgB,EAChB,OAA+B,EAC/B,iBAA0B,EAC1B,gBAAyB;IAEzB,MAAM,QAAQ,GAAG,iBAAiB,IAAI,qBAAqB,CAAC;IAC5D,MAAM,OAAO,GAAG,gBAAgB,IAAI,yBAAyB,CAAC;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACnD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAKD,SAAS,yBAAyB,CAAC,OAA+B;IAC9D,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,GAAG,+BAA+B,CAAC;IACpD,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,OAAO,MAAM,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,CAAC;AAC9C,CAAC;AAKD,SAAS,eAAe;IACpB,OAAO;;;;;;;gBAOK,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;;CAEvC,CAAC;AACF,CAAC;AAKD,SAAS,eAAe,CAAC,KAA2B;IAChD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,MAAM,KAAK,CAAC,OAAO,GAAG,CAAC;IAE1D,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,GAAG,OAAO,aAAa,KAAK,CAAC,WAAW,MAAM,CAAC;IAC1D,CAAC;IAED,OAAO,GAAG,OAAO,2BAA2B,KAAK,CAAC,WAAW,MAAM,CAAC;AACxE,CAAC"}
package/dist/install/config-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/install/config-manager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAKpE,MAAM,WAAW,mBAAmB;IAEhC,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,OAAO,CAAC;CACpB;AAKD,MAAM,WAAW,qBAAqB;IAElC,OAAO,EAAE,OAAO,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AASD,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,aAAa,GACxB,qBAAqB,CAuBvB;AASD,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAChB,qBAAqB,CAavB;AAUD,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,GACjB,qBAAqB,CAavB"}
1
+ {"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/install/config-manager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAQpE,MAAM,WAAW,mBAAmB;IAEhC,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,OAAO,CAAC;CACpB;AAKD,MAAM,WAAW,qBAAqB;IAElC,OAAO,EAAE,OAAO,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AASD,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,aAAa,GACxB,qBAAqB,CA0BvB;AASD,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAChB,qBAAqB,CAgBvB;AAUD,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,GACjB,qBAAqB,CAgBvB"}
package/dist/install/config-manager.js CHANGED
@@ -1,7 +1,11 @@
1
- import { readFileSync, writeFileSync } from 'node:fs';
1
+ import { readFileSync, writeFileSync, existsSync } from 'node:fs';
2
2
  import { resolve } from 'node:path';
3
+ const CONFIG_FILE_NAME = 'mj.config.cjs';
3
4
  export function AddServerDynamicPackages(repoRoot, manifest) {
4
- const configPath = resolve(repoRoot, 'mj.config.cjs');
5
+ const configPath = resolveConfigPath(repoRoot);
6
+ if (!configPath) {
7
+ return { Success: false, ErrorMessage: `No MJ config file found in ${repoRoot}. Expected: ${CONFIG_FILE_NAME}` };
8
+ }
5
9
  const serverPackages = GetServerPackagesFromManifest(manifest);
6
10
  if (serverPackages.length === 0) {
7
11
  return { Success: true };
@@ -21,7 +25,10 @@ export function AddServerDynamicPackages(repoRoot, manifest) {
21
25
  }
22
26
  }
23
27
  export function RemoveServerDynamicPackages(repoRoot, appName) {
24
- const configPath = resolve(repoRoot, 'mj.config.cjs');
28
+ const configPath = resolveConfigPath(repoRoot);
29
+ if (!configPath) {
30
+ return { Success: false, ErrorMessage: `No MJ config file found in ${repoRoot}` };
31
+ }
25
32
  try {
26
33
  let content = readFileSync(configPath, 'utf-8');
27
34
  content = RemoveEntriesForApp(content, appName);
@@ -34,7 +41,10 @@ export function RemoveServerDynamicPackages(repoRoot, appName) {
34
41
  }
35
42
  }
36
43
  export function ToggleServerDynamicPackages(repoRoot, appName, enabled) {
37
- const configPath = resolve(repoRoot, 'mj.config.cjs');
44
+ const configPath = resolveConfigPath(repoRoot);
45
+ if (!configPath) {
46
+ return { Success: false, ErrorMessage: `No MJ config file found in ${repoRoot}` };
47
+ }
38
48
  try {
39
49
  let content = readFileSync(configPath, 'utf-8');
40
50
  content = ToggleEntriesForApp(content, appName, enabled);
@@ -46,6 +56,10 @@ export function ToggleServerDynamicPackages(repoRoot, appName, enabled) {
46
56
  return { Success: false, ErrorMessage: `Failed to update config: ${message}` };
47
57
  }
48
58
  }
59
+ function resolveConfigPath(repoRoot) {
60
+ const candidate = resolve(repoRoot, CONFIG_FILE_NAME);
61
+ return existsSync(candidate) ? candidate : undefined;
62
+ }
49
63
  function GetServerPackagesFromManifest(manifest) {
50
64
  const entries = [];
51
65
  const serverPkgs = manifest.packages?.server ?? [];
package/dist/install/config-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/install/config-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/install/config-manager.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAiCzC,MAAM,UAAU,wBAAwB,CACpC,QAAgB,EAChB,QAAuB;IAEvB,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,8BAA8B,QAAQ,eAAe,gBAAgB,EAAE,EAAE,CAAC;IACrH,CAAC;IACD,MAAM,cAAc,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IAE/D,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,CAAC;QACD,IAAI,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAEhD,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACjC,OAAO,GAAG,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC;QAED,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,KAAc,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,4BAA4B,OAAO,EAAE,EAAE,CAAC;IACnF,CAAC;AACL,CAAC;AASD,MAAM,UAAU,2BAA2B,CACvC,QAAgB,EAChB,OAAe;IAEf,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,8BAA8B,QAAQ,EAAE,EAAE,CAAC;IACtF,CAAC;IAED,IAAI,CAAC;QACD,IAAI,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAChD,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,KAAc,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,4BAA4B,OAAO,EAAE,EAAE,CAAC;IACnF,CAAC;AACL,CAAC;AAUD,MAAM,UAAU,2BAA2B,CACvC,QAAgB,EAChB,OAAe,EACf,OAAgB;IAEhB,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,8BAA8B,QAAQ,EAAE,EAAE,CAAC;IACtF,CAAC;IAED,IAAI,CAAC;QACD,IAAI,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACzD,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,KAAc,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,4BAA4B,OAAO,EAAE,EAAE,CAAC;IACnF,CAAC;AACL,CAAC;AAMD,SAAS,iBAAiB,CAAC,QAAgB;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACtD,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAKD,SAAS,6BAA6B,CAAC,QAAuB;IAC1D,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;QAC/C,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,GAAG,CAAC,IAAI;gBACrB,aAAa,EAAE,GAAG,CAAC,aAAa;gBAChC,OAAO,EAAE,QAAQ,CAAC,IAAI;gBACtB,OAAO,EAAE,IAAI;aAChB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAMD,SAAS,4BAA4B,CAAC,OAAe;IACjD,IAAI,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACnB,CAAC;IAGD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,gDAAgD,CAAC;IACjE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AACtF,CAAC;AAKD,SAAS,qBAAqB,CAAC,OAAe,EAAE,KAA0B;IAEtE,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5D,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,oCAAoC,KAAK,CAAC,WAAW,+BAA+B,KAAK,CAAC,aAAa,yBAAyB,KAAK,CAAC,OAAO,wBAAwB,KAAK,CAAC,OAAO,YAAY,CAAC;IAGhN,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACvE,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IACpE,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAClG,CAAC;AAKD,SAAS,mBAAmB,CAAC,OAAe,EAAE,OAAe;IAIzD,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,6BAA6B,WAAW,CAAC,OAAO,CAAC,cAAc,EAC/D,GAAG,CACN,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAKD,SAAS,mBAAmB,CAAC,OAAe,EAAE,OAAe,EAAE,OAAgB;IAG3E,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,iBAAiB,WAAW,CAAC,OAAO,CAAC,oCAAoC,EACzE,GAAG,CACN,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;AACpD,CAAC;AAKD,SAAS,mBAAmB,CAAC,OAAe,EAAE,OAAe;IACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC/C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,GAAG,GAAG,OAAO,GAAG,CAAC,CAAC;IAEtB,OAAO,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACvC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ;YAAE,KAAK,EAAE,CAAC;QACvC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,KAAK,EAAE,CAAC;QACxC,GAAG,EAAE,CAAC;IACV,CAAC;IAED,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;AAKD,SAAS,WAAW,CAAC,GAAW;IAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC"}
package/dist/install/install-orchestrator.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import type { AppInstallCallbacks, InstallOptions, UpgradeOptions, RemoveOptions, AppOperationResult } from '../types/open-app-types.js';
2
2
  import { type GitHubClientOptions } from '../github/github-client.js';
3
3
  import { type SkywayDatabaseConfig } from './migration-runner.js';
4
+ import { type PackageManagerType, type VersionStrategy, type WorkspaceTarget } from './package-manager.js';
4
5
  import { DatabaseProviderBase } from '@memberjunction/core';
5
6
  import type { UserInfo } from '@memberjunction/core';
6
7
  export interface OrchestratorContext {
@@ -11,6 +12,12 @@ export interface OrchestratorContext {
11
12
  RepoRoot: string;
12
13
  MJVersion: string;
13
14
  Callbacks?: AppInstallCallbacks;
15
+ ServerPackagePath?: string;
16
+ ClientPackagePath?: string;
17
+ PackageManager?: PackageManagerType;
18
+ VersionStrategy?: VersionStrategy;
19
+ AdditionalTargets?: WorkspaceTarget[];
20
+ ClientBootstrapSubpath?: string;
14
21
  }
15
22
  export declare function InstallApp(options: InstallOptions, context: OrchestratorContext): Promise<AppOperationResult>;
16
23
  export declare function UpgradeApp(options: UpgradeOptions, context: OrchestratorContext): Promise<AppOperationResult>;
package/dist/install/install-orchestrator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install-orchestrator.d.ts","sourceRoot":"","sources":["../../src/install/install-orchestrator.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAc,MAAM,4BAA4B,CAAC;AAMrJ,OAAO,EAAiE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAErI,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAIpF,OAAO,EAAc,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAiBrD,MAAM,WAAW,mBAAmB;IAElC,WAAW,EAAE,QAAQ,CAAC;IAEtB,gBAAgB,EAAE,oBAAoB,CAAC;IAEvC,cAAc,EAAE,oBAAoB,CAAC;IAErC,aAAa,EAAE,mBAAmB,CAAC;IAEnC,QAAQ,EAAE,MAAM,CAAC;IAEjB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AA0BD,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsJnH;AAmED,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiKnH;AASD,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkHjH;AASD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmB3G;AAKD,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmB1G"}
1
+ {"version":3,"file":"install-orchestrator.d.ts","sourceRoot":"","sources":["../../src/install/install-orchestrator.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAc,MAAM,4BAA4B,CAAC;AAMrJ,OAAO,EAAiE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAErI,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAwD,KAAK,kBAAkB,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGjK,OAAO,EAAc,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAiBrD,MAAM,WAAW,mBAAmB;IAElC,WAAW,EAAE,QAAQ,CAAC;IAEtB,gBAAgB,EAAE,oBAAoB,CAAC;IAEvC,cAAc,EAAE,oBAAoB,CAAC;IAErC,aAAa,EAAE,mBAAmB,CAAC;IAEnC,QAAQ,EAAE,MAAM,CAAC;IAEjB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,cAAc,CAAC,EAAE,kBAAkB,CAAC;IAEpC,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC;IAEtC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AA0BD,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsJnH;AAmED,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiKnH;AASD,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsHjH;AASD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmB3G;AAKD,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmB1G"}
package/dist/install/install-orchestrator.js CHANGED
@@ -7,7 +7,7 @@ import { ResolveDependencies } from '../dependency/dependency-resolver.js';
7
7
  import { FetchManifestFromGitHub, DownloadMigrations, GetLatestVersion } from '../github/github-client.js';
8
8
  import { CreateAppSchema, DropAppSchema, SchemaExists, EscapeSqlString } from './schema-manager.js';
9
9
  import { RunAppMigrations } from './migration-runner.js';
10
- import { AddAppPackages, RemoveAppPackages, RunNpmInstall } from './package-manager.js';
10
+ import { AddAppPackages, RemoveAppPackages, RunPackageInstall } from './package-manager.js';
11
11
  import { AddServerDynamicPackages, RemoveServerDynamicPackages, ToggleServerDynamicPackages } from './config-manager.js';
12
12
  import { RegenerateClientBootstrap } from './client-bootstrap-gen.js';
13
13
  import { Metadata, RunView } from '@memberjunction/core';
@@ -293,8 +293,8 @@ export async function RemoveApp(options, context) {
293
293
  }
294
294
  }
295
295
  await SetAppStatus(context.ContextUser, existingApp.ID, 'Removing');
296
- removeManifest = JSON.parse(existingApp.ManifestJSON);
297
- const manifest = removeManifest;
296
+ const manifest = JSON.parse(existingApp.ManifestJSON);
297
+ removeManifest = manifest;
298
298
  if (manifest.hooks?.preRemove) {
299
299
  Callbacks?.OnProgress?.('Hooks', 'Running preRemove hook...');
300
300
  await ExecuteHook(manifest.hooks.preRemove, context.RepoRoot);
@@ -309,12 +309,16 @@ export async function RemoveApp(options, context) {
309
309
  ClientPackages: manifest.packages?.client ?? [],
310
310
  SharedPackages: manifest.packages?.shared ?? [],
311
311
  Version: existingApp.Version,
312
+ ServerPackagePath: context.ServerPackagePath,
313
+ ClientPackagePath: context.ClientPackagePath,
314
+ PackageManager: context.PackageManager,
315
+ AdditionalTargets: context.AdditionalTargets,
312
316
  })),
313
317
  ]);
314
- Callbacks?.OnProgress?.('Packages', 'Running npm install...');
315
- const npmResult = RunNpmInstall(context.RepoRoot, options.Verbose);
316
- if (!npmResult.Success) {
317
- Callbacks?.OnWarn?.('Packages', `npm install warning during removal: ${npmResult.ErrorMessage}`);
318
+ Callbacks?.OnProgress?.('Packages', 'Running package install...');
319
+ const installResult = RunPackageInstall(context.RepoRoot, options.Verbose, undefined, context.PackageManager);
320
+ if (!installResult.Success) {
321
+ Callbacks?.OnWarn?.('Packages', `Package install warning during removal: ${installResult.ErrorMessage}`);
318
322
  }
319
323
  if (existingApp.SchemaName) {
320
324
  Callbacks?.OnProgress?.('Metadata', `Removing entity metadata for schema '${existingApp.SchemaName}'...`);
@@ -409,10 +413,11 @@ async function ResolveDependencyChain(manifest, context) {
409
413
  for (const app of installedApps) {
410
414
  installedMap[app.Name] = { Version: app.Version, Repository: app.RepositoryURL };
411
415
  }
416
+ const dependencies = (manifest.dependencies ?? {});
412
417
  const rootNode = {
413
418
  AppName: manifest.name,
414
419
  Repository: manifest.repository,
415
- Dependencies: manifest.dependencies,
420
+ Dependencies: dependencies,
416
421
  };
417
422
  const result = ResolveDependencies(rootNode, installedMap);
418
423
  if (!result.Success) {
@@ -482,19 +487,24 @@ async function HandlePackageInstallation(manifest, context) {
482
487
  if (!manifest.packages) {
483
488
  return { Success: true };
484
489
  }
485
- context.Callbacks?.OnProgress?.('Packages', 'Adding npm packages...');
490
+ context.Callbacks?.OnProgress?.('Packages', 'Adding packages...');
486
491
  const addResult = AddAppPackages({
487
492
  RepoRoot: context.RepoRoot,
488
493
  ServerPackages: manifest.packages.server ?? [],
489
494
  ClientPackages: manifest.packages.client ?? [],
490
495
  SharedPackages: manifest.packages.shared ?? [],
491
496
  Version: manifest.version,
497
+ ServerPackagePath: context.ServerPackagePath,
498
+ ClientPackagePath: context.ClientPackagePath,
499
+ PackageManager: context.PackageManager,
500
+ VersionStrategy: context.VersionStrategy,
501
+ AdditionalTargets: context.AdditionalTargets,
492
502
  });
493
503
  if (!addResult.Success) {
494
504
  return { Success: false, ErrorMessage: addResult.ErrorMessage };
495
505
  }
496
- context.Callbacks?.OnProgress?.('Packages', 'Running npm install...');
497
- const installResult = RunNpmInstall(context.RepoRoot, undefined, manifest.packages.registry);
506
+ context.Callbacks?.OnProgress?.('Packages', 'Running package install...');
507
+ const installResult = RunPackageInstall(context.RepoRoot, undefined, manifest.packages.registry, context.PackageManager);
498
508
  return { Success: installResult.Success, ErrorMessage: installResult.ErrorMessage };
499
509
  }
500
510
  function HandleServerConfig(manifest, context) {
@@ -529,7 +539,7 @@ async function HandleClientBootstrapRegeneration(context) {
529
539
  });
530
540
  }
531
541
  }
532
- RegenerateClientBootstrap(context.RepoRoot, entries);
542
+ RegenerateClientBootstrap(context.RepoRoot, entries, context.ClientPackagePath, context.ClientBootstrapSubpath);
533
543
  }
534
544
  function TopologicalSortApps(appDeps) {
535
545
  const visited = new Set();
package/dist/install/install-orchestrator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install-orchestrator.js","sourceRoot":"","sources":["../../src/install/install-orchestrator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install-orchestrator.js","sourceRoot":"","sources":["../../src/install/install-orchestrator.ts"],"names":[],"mappings":"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"}
package/dist/install/migration-runner.d.ts CHANGED
@@ -11,6 +11,9 @@ export interface SkywayDatabaseConfig {
11
11
  User: string;
12
12
  Password: string;
13
13
  TrustedConnection?: boolean;
14
+ Encrypt?: boolean;
15
+ TrustServerCertificate?: boolean;
16
+ RequestTimeout?: number;
14
17
  }
15
18
  export type FlywayDatabaseConfig = SkywayDatabaseConfig;
16
19
  export interface MigrationRunResult {
package/dist/install/migration-runner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migration-runner.d.ts","sourceRoot":"","sources":["../../src/install/migration-runner.ts"],"names":[],"mappings":"AA2CA,MAAM,WAAW,mBAAmB;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,EAAE,oBAAoB,CAAC;IAErC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAKD,MAAM,WAAW,oBAAoB;IAEjC,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAKD,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAKxD,MAAM,WAAW,kBAAkB;IAE/B,OAAO,EAAE,OAAO,CAAC;IAEjB,iBAAiB,EAAE,MAAM,CAAC;IAE1B,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAaD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6ChG"}
1
+ {"version":3,"file":"migration-runner.d.ts","sourceRoot":"","sources":["../../src/install/migration-runner.ts"],"names":[],"mappings":"AA2CA,MAAM,WAAW,mBAAmB;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,EAAE,oBAAoB,CAAC;IAErC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAKD,MAAM,WAAW,oBAAoB;IAEjC,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAKD,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAKxD,MAAM,WAAW,kBAAkB;IAE/B,OAAO,EAAE,OAAO,CAAC;IAEjB,iBAAiB,EAAE,MAAM,CAAC;IAE1B,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAaD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6ChG"}
package/dist/install/migration-runner.js CHANGED
@@ -41,6 +41,9 @@ function BuildSkywayConfig(migrationsDir, schemaName, dbConfig) {
41
41
  const absoluteDir = path.isAbsolute(migrationsDir)
42
42
  ? migrationsDir
43
43
  : path.resolve(migrationsDir);
44
+ const isAzureSql = dbConfig.Host.includes('.database.windows.net');
45
+ const encrypt = dbConfig.Encrypt ?? isAzureSql;
46
+ const trustCert = dbConfig.TrustServerCertificate ?? !isAzureSql;
44
47
  return {
45
48
  Database: {
46
49
  Server: dbConfig.Host,
@@ -49,7 +52,9 @@ function BuildSkywayConfig(migrationsDir, schemaName, dbConfig) {
49
52
  User: dbConfig.User,
50
53
  Password: dbConfig.Password,
51
54
  Options: {
52
- TrustServerCertificate: true,
55
+ Encrypt: encrypt,
56
+ TrustServerCertificate: trustCert,
57
+ ...(dbConfig.RequestTimeout ? { RequestTimeout: dbConfig.RequestTimeout } : {}),
53
58
  },
54
59
  },
55
60
  Migrations: {
package/dist/install/migration-runner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migration-runner.js","sourceRoot":"","sources":["../../src/install/migration-runner.ts"],"names":[],"mappings":"AAUA,OAAO,IAAI,MAAM,WAAW,CAAC;AA4F7B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAA4B;IAC/D,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvE,IAAI,MAAkC,CAAC;IAEvC,IAAI,CAAC;QAGD,MAAM,cAAc,GAAG,6BAA6B,CAAC;QACrD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QAE5E,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,yCAAyC,UAAU,GAAG,CAAC,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,qBAAqB,aAAa,EAAE,CAAC,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,aAAa,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAmB,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO;aAC9B,MAAM,CAAC,CAAC,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAsC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3E,OAAO;YACH,OAAO,EAAE,IAAI;YACb,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,YAAY,EAAE,YAAY;SAC7B,CAAC;IACN,CAAC;IACD,OAAO,KAAc,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO;YACH,OAAO,EAAE,KAAK;YACd,iBAAiB,EAAE,CAAC;YACpB,YAAY,EAAE,EAAE;YAChB,YAAY,EAAE,gCAAgC,UAAU,MAAM,OAAO,EAAE;SAC1E,CAAC;IACN,CAAC;YACO,CAAC;QACL,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAA6B,CAAC,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;AACL,CAAC;AAKD,SAAS,iBAAiB,CACtB,aAAqB,EACrB,UAAkB,EAClB,QAA8B;IAE9B,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAC9C,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAElC,OAAO;QACH,QAAQ,EAAE;YACN,MAAM,EAAE,QAAQ,CAAC,IAAI;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,OAAO,EAAE;gBACL,sBAAsB,EAAE,IAAI;aAC/B;SACJ;QACD,UAAU,EAAE;YACR,SAAS,EAAE,CAAC,WAAW,CAAC;YACxB,aAAa,EAAE,UAAU;YACzB,eAAe,EAAE,GAAG;YACpB,iBAAiB,EAAE,IAAI;SAC1B;QACD,YAAY,EAAE;YACV,sBAAsB,EAAE,UAAU;SACrC;KACJ,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"migration-runner.js","sourceRoot":"","sources":["../../src/install/migration-runner.ts"],"names":[],"mappings":"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"}
package/dist/install/package-manager.d.ts CHANGED
@@ -1,4 +1,10 @@
1
1
  import type { ManifestPackageEntry } from '../manifest/manifest-schema.js';
2
+ export type PackageManagerType = 'npm' | 'pnpm' | 'yarn';
3
+ export type VersionStrategy = 'semver' | 'catalog' | 'workspace' | 'auto';
4
+ export interface WorkspaceTarget {
5
+ Path: string;
6
+ Role: 'server' | 'client';
7
+ }
2
8
  export interface PackageManagerOptions {
3
9
  RepoRoot: string;
4
10
  ServerPackages: ManifestPackageEntry[];
@@ -6,6 +12,11 @@ export interface PackageManagerOptions {
6
12
  SharedPackages: ManifestPackageEntry[];
7
13
  Version: string;
8
14
  Verbose?: boolean;
15
+ ServerPackagePath?: string;
16
+ ClientPackagePath?: string;
17
+ PackageManager?: PackageManagerType;
18
+ VersionStrategy?: VersionStrategy;
19
+ AdditionalTargets?: WorkspaceTarget[];
9
20
  }
10
21
  export interface PackageOperationResult {
11
22
  Success: boolean;
@@ -15,5 +26,8 @@ export interface PackageOperationResult {
15
26
  }
16
27
  export declare function AddAppPackages(options: PackageManagerOptions): PackageOperationResult;
17
28
  export declare function RemoveAppPackages(options: PackageManagerOptions): PackageOperationResult;
29
+ export declare function detectPackageManager(repoRoot: string): PackageManagerType;
30
+ export declare function hasPnpmCatalog(repoRoot: string): boolean;
31
+ export declare function RunPackageInstall(repoRoot: string, verbose?: boolean, registryUrl?: string, packageManager?: PackageManagerType): PackageOperationResult;
18
32
  export declare function RunNpmInstall(repoRoot: string, verbose?: boolean, registryUrl?: string): PackageOperationResult;
19
33
  //# sourceMappingURL=package-manager.d.ts.map
package/dist/install/package-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/install/package-manager.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAK3E,MAAM,WAAW,qBAAqB;IAEpC,QAAQ,EAAE,MAAM,CAAC;IAEjB,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAYD,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,sBAAsB,CAwBrF;AAQD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,sBAAsB,CAwBxF;AASD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAiB/G"}
1
+ {"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/install/package-manager.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAG3E,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AASzD,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;AAS1E,MAAM,WAAW,eAAe;IAE9B,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC3B;AAKD,MAAM,WAAW,qBAAqB;IAEpC,QAAQ,EAAE,MAAM,CAAC;IAEjB,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IAEvC,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,cAAc,CAAC,EAAE,kBAAkB,CAAC;IAMpC,eAAe,CAAC,EAAE,eAAe,CAAC;IAKlC,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC;CACvC;AAKD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAaD,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,sBAAsB,CAuBrF;AAQD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,sBAAsB,CAsBxF;AAKD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAIzE;AAMD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CASxD;AAeD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,kBAAkB,GAAG,sBAAsB,CAsCxJ;AAKD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAE/G"}
package/dist/install/package-manager.js CHANGED
@@ -1,20 +1,22 @@
1
- import { readFileSync, writeFileSync } from 'node:fs';
1
+ import { readFileSync, writeFileSync, existsSync } from 'node:fs';
2
2
  import { execSync } from 'node:child_process';
3
3
  import { resolve } from 'node:path';
4
+ const DEFAULT_SERVER_PATH = 'packages/MJAPI';
5
+ const DEFAULT_CLIENT_PATH = 'packages/MJExplorer';
4
6
  export function AddAppPackages(options) {
5
7
  const added = [];
8
+ const versionStr = resolveVersionString(options);
6
9
  try {
10
+ const targets = buildTargetList(options);
7
11
  const serverPkgs = [...options.ServerPackages, ...options.SharedPackages];
8
12
  const clientPkgs = [...options.ClientPackages, ...options.SharedPackages];
9
- if (serverPkgs.length > 0) {
10
- const serverPkgJsonPath = resolve(options.RepoRoot, 'packages/MJAPI/package.json');
11
- AddDependenciesToPackageJson(serverPkgJsonPath, serverPkgs, options.Version);
12
- added.push(...serverPkgs.map((p) => p.name));
13
- }
14
- if (clientPkgs.length > 0) {
15
- const clientPkgJsonPath = resolve(options.RepoRoot, 'packages/MJExplorer/package.json');
16
- AddDependenciesToPackageJson(clientPkgJsonPath, clientPkgs, options.Version);
17
- added.push(...clientPkgs.map((p) => p.name));
13
+ for (const target of targets) {
14
+ const pkgs = target.Role === 'server' ? serverPkgs : clientPkgs;
15
+ if (pkgs.length > 0) {
16
+ const pkgJsonPath = resolve(options.RepoRoot, target.Path, 'package.json');
17
+ AddDependenciesToPackageJson(pkgJsonPath, pkgs, versionStr);
18
+ added.push(...pkgs.map((p) => p.name));
19
+ }
18
20
  }
19
21
  return { Success: true, Added: [...new Set(added)], Removed: [] };
20
22
  }
@@ -26,17 +28,16 @@ export function AddAppPackages(options) {
26
28
  export function RemoveAppPackages(options) {
27
29
  const removed = [];
28
30
  try {
31
+ const targets = buildTargetList(options);
29
32
  const serverPkgs = [...options.ServerPackages, ...options.SharedPackages];
30
33
  const clientPkgs = [...options.ClientPackages, ...options.SharedPackages];
31
- if (serverPkgs.length > 0) {
32
- const serverPkgJsonPath = resolve(options.RepoRoot, 'packages/MJAPI/package.json');
33
- RemoveDependenciesFromPackageJson(serverPkgJsonPath, serverPkgs);
34
- removed.push(...serverPkgs.map((p) => p.name));
35
- }
36
- if (clientPkgs.length > 0) {
37
- const clientPkgJsonPath = resolve(options.RepoRoot, 'packages/MJExplorer/package.json');
38
- RemoveDependenciesFromPackageJson(clientPkgJsonPath, clientPkgs);
39
- removed.push(...clientPkgs.map((p) => p.name));
34
+ for (const target of targets) {
35
+ const pkgs = target.Role === 'server' ? serverPkgs : clientPkgs;
36
+ if (pkgs.length > 0) {
37
+ const pkgJsonPath = resolve(options.RepoRoot, target.Path, 'package.json');
38
+ RemoveDependenciesFromPackageJson(pkgJsonPath, pkgs);
39
+ removed.push(...pkgs.map((p) => p.name));
40
+ }
40
41
  }
41
42
  return { Success: true, Added: [], Removed: [...new Set(removed)] };
42
43
  }
@@ -45,13 +46,51 @@ export function RemoveAppPackages(options) {
45
46
  return { Success: false, Added: [], Removed: removed, ErrorMessage: message };
46
47
  }
47
48
  }
48
- export function RunNpmInstall(repoRoot, verbose, registryUrl) {
49
+ export function detectPackageManager(repoRoot) {
50
+ if (existsSync(resolve(repoRoot, 'pnpm-lock.yaml')))
51
+ return 'pnpm';
52
+ if (existsSync(resolve(repoRoot, 'yarn.lock')))
53
+ return 'yarn';
54
+ return 'npm';
55
+ }
56
+ export function hasPnpmCatalog(repoRoot) {
57
+ const wsPath = resolve(repoRoot, 'pnpm-workspace.yaml');
58
+ if (!existsSync(wsPath))
59
+ return false;
60
+ try {
61
+ const content = readFileSync(wsPath, 'utf-8');
62
+ return /^catalogs?:/m.test(content);
63
+ }
64
+ catch {
65
+ return false;
66
+ }
67
+ }
68
+ export function RunPackageInstall(repoRoot, verbose, registryUrl, packageManager) {
69
+ const pm = packageManager ?? detectPackageManager(repoRoot);
49
70
  try {
50
- let flags = verbose ? '' : '--loglevel=warn';
51
- if (registryUrl) {
52
- flags += ` --registry=${registryUrl}`;
71
+ let cmd;
72
+ switch (pm) {
73
+ case 'pnpm': {
74
+ cmd = 'pnpm install';
75
+ if (registryUrl)
76
+ cmd += ` --registry=${registryUrl}`;
77
+ break;
78
+ }
79
+ case 'yarn': {
80
+ cmd = 'yarn install';
81
+ if (registryUrl)
82
+ cmd += ` --registry=${registryUrl}`;
83
+ break;
84
+ }
85
+ default: {
86
+ let flags = verbose ? '' : '--loglevel=warn';
87
+ if (registryUrl)
88
+ flags += ` --registry=${registryUrl}`;
89
+ cmd = `npm install ${flags}`;
90
+ break;
91
+ }
53
92
  }
54
- execSync(`npm install ${flags}`, {
93
+ execSync(cmd, {
55
94
  cwd: repoRoot,
56
95
  encoding: 'utf-8',
57
96
  timeout: 300000,
@@ -61,17 +100,49 @@ export function RunNpmInstall(repoRoot, verbose, registryUrl) {
61
100
  }
62
101
  catch (error) {
63
102
  const message = error instanceof Error ? error.message : String(error);
64
- return { Success: false, Added: [], Removed: [], ErrorMessage: `npm install failed: ${message}` };
103
+ return { Success: false, Added: [], Removed: [], ErrorMessage: `${pm} install failed: ${message}` };
104
+ }
105
+ }
106
+ export function RunNpmInstall(repoRoot, verbose, registryUrl) {
107
+ return RunPackageInstall(repoRoot, verbose, registryUrl, 'npm');
108
+ }
109
+ function buildTargetList(options) {
110
+ const targets = [
111
+ { Path: options.ServerPackagePath ?? DEFAULT_SERVER_PATH, Role: 'server' },
112
+ { Path: options.ClientPackagePath ?? DEFAULT_CLIENT_PATH, Role: 'client' },
113
+ ];
114
+ if (options.AdditionalTargets) {
115
+ targets.push(...options.AdditionalTargets);
116
+ }
117
+ return targets;
118
+ }
119
+ function resolveVersionString(options) {
120
+ const strategy = options.VersionStrategy ?? 'auto';
121
+ switch (strategy) {
122
+ case 'catalog':
123
+ return 'catalog:';
124
+ case 'workspace':
125
+ return 'workspace:*';
126
+ case 'auto': {
127
+ const pm = options.PackageManager ?? detectPackageManager(options.RepoRoot);
128
+ if (pm === 'pnpm' && hasPnpmCatalog(options.RepoRoot)) {
129
+ return 'catalog:';
130
+ }
131
+ return `^${options.Version}`;
132
+ }
133
+ case 'semver':
134
+ default:
135
+ return `^${options.Version}`;
65
136
  }
66
137
  }
67
- function AddDependenciesToPackageJson(pkgJsonPath, packages, version) {
138
+ function AddDependenciesToPackageJson(pkgJsonPath, packages, versionStr) {
68
139
  const content = readFileSync(pkgJsonPath, 'utf-8');
69
140
  const pkgJson = JSON.parse(content);
70
141
  if (!pkgJson.dependencies) {
71
142
  pkgJson.dependencies = {};
72
143
  }
73
144
  for (const pkg of packages) {
74
- pkgJson.dependencies[pkg.name] = `^${version}`;
145
+ pkgJson.dependencies[pkg.name] = versionStr;
75
146
  }
76
147
  writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + '\n', 'utf-8');
77
148
  }
package/dist/install/package-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../src/install/package-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../src/install/package-manager.ts"],"names":[],"mappings":"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"}
package/dist/install/schema-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schema-manager.d.ts","sourceRoot":"","sources":["../../src/install/schema-manager.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAgB5D,MAAM,WAAW,qBAAqB;IAEpC,OAAO,EAAE,OAAO,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAQD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CAgB5E;AASD,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAKlB;AASD,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAyBhC;AASD,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAwBhC;AAyED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD"}
1
+ {"version":3,"file":"schema-manager.d.ts","sourceRoot":"","sources":["../../src/install/schema-manager.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAgB5D,MAAM,WAAW,qBAAqB;IAEpC,OAAO,EAAE,OAAO,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAQD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CAgB5E;AASD,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAKlB;AASD,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAyBhC;AASD,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAwBhC;AAgFD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD"}
package/dist/install/schema-manager.js CHANGED
@@ -73,47 +73,47 @@ export async function DropAppSchema(schemaName, provider) {
73
73
  async function DropAllSchemaObjects(schemaName, provider) {
74
74
  const escaped = EscapeSqlString(schemaName);
75
75
  await provider.ExecuteSQL(`
76
- DECLARE @sql NVARCHAR(MAX) = '';
77
- SELECT @sql = @sql + 'ALTER TABLE [${escaped}].[' + OBJECT_NAME(parent_object_id) + '] DROP CONSTRAINT [' + name + '];' + CHAR(10)
76
+ DECLARE @sql NVARCHAR(MAX) = N'';
77
+ SELECT @sql = @sql + N'ALTER TABLE ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(OBJECT_NAME(parent_object_id)) + N' DROP CONSTRAINT ' + QUOTENAME(name) + N';' + CHAR(10)
78
78
  FROM sys.foreign_keys
79
79
  WHERE SCHEMA_NAME(schema_id) = '${escaped}';
80
- EXEC sp_executesql @sql;
80
+ IF @sql <> N'' EXEC sp_executesql @sql;
81
81
  `);
82
82
  await provider.ExecuteSQL(`
83
- DECLARE @sql NVARCHAR(MAX) = '';
84
- SELECT @sql = @sql + 'DROP VIEW [${escaped}].[' + name + '];' + CHAR(10)
83
+ DECLARE @sql NVARCHAR(MAX) = N'';
84
+ SELECT @sql = @sql + N'DROP VIEW ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
85
85
  FROM sys.views WHERE SCHEMA_NAME(schema_id) = '${escaped}';
86
- EXEC sp_executesql @sql;
86
+ IF @sql <> N'' EXEC sp_executesql @sql;
87
87
  `);
88
88
  await provider.ExecuteSQL(`
89
- DECLARE @sql NVARCHAR(MAX) = '';
90
- SELECT @sql = @sql + 'DROP PROCEDURE [${escaped}].[' + name + '];' + CHAR(10)
89
+ DECLARE @sql NVARCHAR(MAX) = N'';
90
+ SELECT @sql = @sql + N'DROP PROCEDURE ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
91
91
  FROM sys.procedures WHERE SCHEMA_NAME(schema_id) = '${escaped}';
92
- EXEC sp_executesql @sql;
92
+ IF @sql <> N'' EXEC sp_executesql @sql;
93
93
  `);
94
94
  await provider.ExecuteSQL(`
95
- DECLARE @sql NVARCHAR(MAX) = '';
96
- SELECT @sql = @sql + 'DROP FUNCTION [${escaped}].[' + name + '];' + CHAR(10)
95
+ DECLARE @sql NVARCHAR(MAX) = N'';
96
+ SELECT @sql = @sql + N'DROP FUNCTION ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
97
97
  FROM sys.objects WHERE type IN ('FN','IF','TF') AND SCHEMA_NAME(schema_id) = '${escaped}';
98
- EXEC sp_executesql @sql;
98
+ IF @sql <> N'' EXEC sp_executesql @sql;
99
99
  `);
100
100
  await provider.ExecuteSQL(`
101
- DECLARE @sql NVARCHAR(MAX) = '';
102
- SELECT @sql = @sql + 'DROP TABLE [${escaped}].[' + name + '];' + CHAR(10)
101
+ DECLARE @sql NVARCHAR(MAX) = N'';
102
+ SELECT @sql = @sql + N'DROP TABLE ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
103
103
  FROM sys.tables WHERE SCHEMA_NAME(schema_id) = '${escaped}';
104
- EXEC sp_executesql @sql;
104
+ IF @sql <> N'' EXEC sp_executesql @sql;
105
105
  `);
106
106
  await provider.ExecuteSQL(`
107
- DECLARE @sql NVARCHAR(MAX) = '';
108
- SELECT @sql = @sql + 'DROP TYPE [${escaped}].[' + name + '];' + CHAR(10)
107
+ DECLARE @sql NVARCHAR(MAX) = N'';
108
+ SELECT @sql = @sql + N'DROP TYPE ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
109
109
  FROM sys.types WHERE SCHEMA_NAME(schema_id) = '${escaped}' AND is_user_defined = 1;
110
- EXEC sp_executesql @sql;
110
+ IF @sql <> N'' EXEC sp_executesql @sql;
111
111
  `);
112
112
  await provider.ExecuteSQL(`
113
- DECLARE @sql NVARCHAR(MAX) = '';
114
- SELECT @sql = @sql + 'DROP SEQUENCE [${escaped}].[' + name + '];' + CHAR(10)
113
+ DECLARE @sql NVARCHAR(MAX) = N'';
114
+ SELECT @sql = @sql + N'DROP SEQUENCE ' + QUOTENAME('${escaped}') + N'.' + QUOTENAME(name) + N';' + CHAR(10)
115
115
  FROM sys.sequences WHERE SCHEMA_NAME(schema_id) = '${escaped}';
116
- EXEC sp_executesql @sql;
116
+ IF @sql <> N'' EXEC sp_executesql @sql;
117
117
  `);
118
118
  }
119
119
  export function EscapeSqlString(value) {
package/dist/install/schema-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schema-manager.js","sourceRoot":"","sources":["../../src/install/schema-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema-manager.js","sourceRoot":"","sources":["../../src/install/schema-manager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/open-app-engine",
3
- "version": "5.7.0",
3
+ "version": "5.9.0",
4
4
  "description": "MemberJunction: MJ Open App Engine - packaging, distribution, and installation system for MJ Open Apps.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -16,8 +16,8 @@
16
16
  "author": "MemberJunction.com",
17
17
  "license": "ISC",
18
18
  "dependencies": {
19
- "@memberjunction/core": "5.7.0",
20
- "@memberjunction/global": "5.7.0",
19
+ "@memberjunction/core": "5.9.0",
20
+ "@memberjunction/global": "5.9.0",
21
21
  "semver": "^7.7.1",
22
22
  "simple-git": "^3.27.0",
23
23
  "zod": "^3.24.3"