@buoy-gg/angular 7.0.73 → 7.0.75

package/README.md

@@ -17,7 +17,7 @@ Run these from your app folder:
 
 ```sh
 ng add @buoy-gg/angular
-npx buoy login
+npx --package=@buoy-gg/core buoy login
 ng serve
 ```
 
@@ -41,7 +41,7 @@ For more than one app, choose it by name:
 
 ```sh
 ng add @buoy-gg/angular --project my-app
-npx buoy login --project my-app
+npx --package=@buoy-gg/core buoy login --project my-app
 ```
 
 Login writes `src/environments/buoy.ts` under the app's source root.

package/lib/schematics/ng-add/index.cjs

@@ -1,8 +1,8 @@
 const{createRequire}=require("node:module");const appRequire=createRequire(require("node:path").join(process.cwd(),"package.json"));const ts=appRequire("typescript");const path=require("node:path").posix;const catalog=require("./tools.json");const read=(r,e)=>{const o=ts.parseConfigFileTextToJson(e,r.readText(e));if(o.error)throw new Error(`Cannot read ${e}. Fix its JSON, then run ng add again.`);return o.config};const write=(r,e,o)=>{const a=JSON.stringify(o,null,2)+"\n";if(!r.exists(e))r.create(e,a);else if(r.readText(e)!==a)r.overwrite(e,a)};function select(r,e){const o=read(r,"/angular.json");const a=Object.keys(o.projects).filter(s=>o.projects[s].projectType==="application");const t=e.project||o.defaultProject||(a.length===1?a[0]:void 0);if(!t||!a.includes(t))throw new Error("Choose an app with --project <name>.");return{workspace:o,name:t,project:o.projects[t]}}function defaults(r){const e={...r.dependencies,...r.devDependencies};const o=["network","console","storage","events","env"];if(e["@angular/router"])o.push("route-events");if(Object.keys(e).some(a=>a.startsWith("@tanstack/angular-query-")))o.push("react-query");if(e["@ngrx/store"]||e["@ngxs/store"])o.push("redux");if(Number((e["@angular/core"]||"").match(/\d+/)?.[0])>=20)o.push("highlight-updates");return o.filter(a=>catalog.some(t=>t.id===a))}function ngAdd(r){return(e,o)=>{const{name:a}=select(e,r);const t=read(e,"/package.json");if(t.buoy?.angular?.[a])return e;r={...r};if(!r.tools?.length)delete r.tools;const s=o.schematic.collection.createSchematic("setup",true);s.description.schemaJson=structuredClone(s.description.schemaJson);s.description.schemaJson.properties.tools.default=defaults(t);return s.call({...r,project:a},appRequire("rxjs").of(e),o)}}function source(r,e){return ts.createSourceFile(e,r.readText(e),ts.ScriptTarget.Latest,true)}function nodes(r,e){const o=[];const a=t=>{if(e(t))o.push(t);ts.forEachChild(t,a)};a(r);return o}function importName(r,e,o,a){const t=source(r,e);for(const l of t.statements)if(ts.isImportDeclaration(l)&&l.moduleSpecifier.text===o){const i=l.importClause?.namedBindings;if(i&&ts.isNamedImports(i)){for(const u of i.elements)if((u.propertyName||u.name).text===a)return u.name.text}}const s=new Set(nodes(t,ts.isIdentifier).map(l=>l.text));let n=a;while(s.has(n))n+="Buoy";r.overwrite(e,`import { ${a}${n!==a?" as "+n:""} } from '${o}';
 `+r.readText(e));return n}function providerFile(r,e){const o=new Set;const a=t=>{if(o.has(t)||!r.exists(t))return;o.add(t);const s=source(r,t);if(nodes(s,n=>ts.isCallExpression(n)&&n.expression.getText(s)==="NgModule").length||nodes(s,n=>ts.isVariableDeclaration(n)&&n.name.getText(s)==="appConfig").length||nodes(s,n=>ts.isCallExpression(n)&&n.expression.getText(s)==="bootstrapApplication"&&n.arguments[1]&&ts.isObjectLiteralExpression(n.arguments[1])).length)return t;for(const n of s.statements)if(ts.isImportDeclaration(n)&&n.moduleSpecifier.text.startsWith(".")){const l=path.join(path.dirname(t),n.moduleSpecifier.text);for(const i of[l+".ts",path.join(l,"index.ts")]){const u=a(i);if(u)return u}}};return a(e)}function providers(r,e,o,a){const t=source(r,e);let s;const n=nodes(t,c=>ts.isCallExpression(c)&&c.expression.getText(t)==="NgModule")[0];if(n)s=n.arguments[0];else s=nodes(t,c=>ts.isVariableDeclaration(c)&&c.name.getText(t)==="appConfig")[0]?.initializer;if(!s)s=nodes(t,c=>ts.isCallExpression(c)&&c.expression.getText(t)==="bootstrapApplication")[0]?.arguments[1];if(!s||!ts.isObjectLiteralExpression(s))throw new Error(`Cannot find a provider list in ${e}. Add provideBuoy() last in your app's providers.`);const l=s.properties.find(c=>c.name?.getText(t)==="providers");const i=r.readText(e);if(!l){const c=s.getEnd()-1;r.overwrite(e,i.slice(0,c)+`${s.properties.length&&!s.properties.hasTrailingComma?",":""}
 providers: [${o}]
-`+i.slice(c));return}if(!ts.isArrayLiteralExpression(l.initializer))throw new Error(`The providers in ${e} use a shared value. Add provideBuoy() last in that list.`);const u=l.initializer;const d=u.elements.map(c=>c.getFullText(t).trim());const y=u.elements.findIndex(c=>nodes(c,v=>ts.isCallExpression(v)&&v.expression.getText(t)===a).length>0);const g=y<0?o:d.splice(y,1)[0];d.push(g);const x=i.includes("\r\n")?"\r\n":"\n";const p=c=>(i.slice(i.lastIndexOf("\n",c-1)+1,c).match(/^[ \t]*/)||[""])[0];const m=p(l.getStart(t));const b=u.elements[0];const h=b&&i.slice(u.getStart(t),b.getStart(t)).includes("\n")?p(b.getStart(t)):"";const $=(i.match(/^[ \t]+(?=\S)/m)||["  "])[0];const j=h||m+$;const T=u.elements.hasTrailingComma||/,\s*\n\s*[}\]]/.test(i);const k="["+x+d.map(c=>j+c).join(","+x)+(T?",":"")+x+m+"]";if(i.slice(u.getStart(t),u.getEnd())!==k)r.overwrite(e,i.slice(0,u.getStart(t))+k+i.slice(u.getEnd()))}function setup(r){return(e,o)=>{const{workspace:a,name:t,project:s}=select(e,r);const n=read(e,"/package.json");const l=[...new Set(r.tools??defaults(n))];for(const p of l)if(!catalog.some(m=>m.id===p))throw new Error(`Unknown Buoy tool: ${p}.`);const i=s.architect||s.targets;if(!i?.build)throw new Error("This app has no build target. Add Buoy by hand.");const u=["@angular/build:application","@buoy-gg/angular:application"].includes(i.build.builder)&&(!i.serve||["@angular/build:dev-server","@buoy-gg/angular:dev-server"].includes(i.serve.builder));const d=s.sourceRoot||path.join(s.root||"","src");const y=i.build.options?.browser||i.build.options?.main||path.join(d,"main.ts");const g=providerFile(e,y)||[path.join(d,"app/app.config.ts"),path.join(d,"app/app.module.ts"),path.join(d,"app/app-module.ts")].find(p=>e.exists(p));if(!g)throw new Error("Cannot find the app entry. Add provideBuoy() last in its providers.");const x=importName(e,g,"@buoy-gg/angular","provideBuoy");if(u){i.build.builder="@buoy-gg/angular:application";if(i.serve)i.serve.builder="@buoy-gg/angular:dev-server";providers(e,g,`${x}()`,x)}else{o.logger.warn(`[Buoy] Kept ${i.build.builder}. It is not an @angular/build builder. Added the manual setup instead.`);const p=path.join(d,"buoy.ts");const m=l.map((f,E)=>`'${f==="notifications"?"push-notifications":f}': await import('@buoy-gg/${f}/web')`).join(",\n    ");const b=path.join(d,"environments/buoy.ts");if(!e.exists(b))e.create(b,"export const BUOY_KEY = '';\n");if(!e.exists(p))e.create(p,`import { BUOY_KEY } from './environments/buoy';
+`+i.slice(c));return}if(!ts.isArrayLiteralExpression(l.initializer))throw new Error(`The providers in ${e} use a shared value. Add provideBuoy() last in that list.`);const u=l.initializer;const d=u.elements.map(c=>c.getFullText(t).trim());const h=u.elements.findIndex(c=>nodes(c,v=>ts.isCallExpression(v)&&v.expression.getText(t)===a).length>0);const g=h<0?o:d.splice(h,1)[0];d.push(g);const x=i.includes("\r\n")?"\r\n":"\n";const p=c=>(i.slice(i.lastIndexOf("\n",c-1)+1,c).match(/^[ \t]*/)||[""])[0];const m=p(l.getStart(t));const b=u.elements[0];const y=b&&i.slice(u.getStart(t),b.getStart(t)).includes("\n")?p(b.getStart(t)):"";const $=(i.match(/^[ \t]+(?=\S)/m)||["  "])[0];const j=y||m+$;const T=u.elements.hasTrailingComma||/,\s*\n\s*[}\]]/.test(i);const k="["+x+d.map(c=>j+c).join(","+x)+(T?",":"")+x+m+"]";if(i.slice(u.getStart(t),u.getEnd())!==k)r.overwrite(e,i.slice(0,u.getStart(t))+k+i.slice(u.getEnd()))}function setup(r){return(e,o)=>{const{workspace:a,name:t,project:s}=select(e,r);const n=read(e,"/package.json");const l=[...new Set(r.tools??defaults(n))];for(const p of l)if(!catalog.some(m=>m.id===p))throw new Error(`Unknown Buoy tool: ${p}.`);const i=s.architect||s.targets;if(!i?.build)throw new Error("This app has no build target. Add Buoy by hand.");const u=["@angular/build:application","@buoy-gg/angular:application"].includes(i.build.builder)&&(!i.serve||["@angular/build:dev-server","@buoy-gg/angular:dev-server"].includes(i.serve.builder));const d=s.sourceRoot||path.join(s.root||"","src");const h=i.build.options?.browser||i.build.options?.main||path.join(d,"main.ts");const g=providerFile(e,h)||[path.join(d,"app/app.config.ts"),path.join(d,"app/app.module.ts"),path.join(d,"app/app-module.ts")].find(p=>e.exists(p));if(!g)throw new Error("Cannot find the app entry. Add provideBuoy() last in its providers.");const x=importName(e,g,"@buoy-gg/angular","provideBuoy");if(u){i.build.builder="@buoy-gg/angular:application";if(i.serve)i.serve.builder="@buoy-gg/angular:dev-server";providers(e,g,`${x}()`,x)}else{o.logger.warn(`[Buoy] Kept ${i.build.builder}. It is not an @angular/build builder. Added the manual setup instead.`);const p=path.join(d,"buoy.ts");const m=l.map((f,E)=>`'${f==="notifications"?"push-notifications":f}': await import('@buoy-gg/${f}/web')`).join(",\n    ");const b=path.join(d,"environments/buoy.ts");if(!e.exists(b))e.create(b,"export const BUOY_KEY = '';\n");if(!e.exists(p))e.create(p,`import { BUOY_KEY } from './environments/buoy';
 export const buoyOptions = { licenseKey: BUOY_KEY, modules: async () => ({
     ${m}
 }) };
-`);let h=path.relative(path.dirname(g),p).replace(/\.ts$/,"");if(!h.startsWith("."))h="./"+h;const $=importName(e,g,h,"buoyOptions");let j=e.readText(g);if(!/declare\s+const\s+ngDevMode/.test(j))e.overwrite(g,"declare const ngDevMode: boolean | undefined;\n"+j);providers(e,g,`(typeof ngDevMode === 'undefined' || ngDevMode) ? ${x}(${$}) : []`,x);const T=e.readText(y);if(!T.includes("'@buoy-gg/angular/register'"))e.overwrite(y,"import '@buoy-gg/angular/register';\n"+T);const k=Number(({...n.dependencies,...n.devDependencies}["@angular/core"]||"").match(/\d+/)?.[0]);const c=(i.build.configurations??={}).production??={};const v=path.join(d,"buoy.prod.ts");if(!e.exists(v))e.create(v,"export const buoyOptions = {};\n");c.fileReplacements=[...(c.fileReplacements||[]).filter(f=>f.replace!==p),{replace:p,with:v}];if(k>=20&&!i.build.builder.endsWith(":browser"))c.conditions=[...new Set(["buoy-disabled",...c.conditions||["module","production"]])];else{const f=path.join(d,"buoy-entry.ts"),E=path.join(d,"buoy-entry.prod.ts");if(!e.exists(f))e.create(f,"import '@buoy-gg/angular/register';\nexport { provideBuoy } from '@buoy-gg/angular';\nexport { buoyOptions } from './buoy';\n");if(!e.exists(E))e.create(E,"import { makeEnvironmentProviders } from '@angular/core';\nexport const provideBuoy = (_options?: unknown) => makeEnvironmentProviders([]);\nexport const buoyOptions = {};\n");let w=path.relative(path.dirname(g),f).replace(/\.ts$/,"");if(!w.startsWith("."))w="./"+w;e.overwrite(g,e.readText(g).replace(/from '@buoy-gg\/angular'/,`from '${w}'`).replace(`from '${h}'`,`from '${w}'`));e.overwrite(y,e.readText(y).replace("import '@buoy-gg/angular/register';\n",""));c.fileReplacements=[...(c.fileReplacements||[]).filter(S=>S.replace!==f),{replace:f,with:E}]}}n.devDependencies??={};for(const p of["core",...l]){const m=catalog.find(h=>h.id===p);const b="@buoy-gg/"+p;if(!n.dependencies?.[b]&&!n.devDependencies[b])n.devDependencies[b]="^"+m.version}if(l.includes("react-query")&&!n.dependencies?.["@tanstack/react-query"]&&!n.devDependencies["@tanstack/react-query"]){const p=Object.entries({...n.dependencies,...n.devDependencies}).find(([m])=>m.startsWith("@tanstack/angular-query-"));n.devDependencies["@tanstack/react-query"]=p?.[1]||"^5.0.0"}n.buoy??={};n.buoy.angular??={};n.buoy.angular[t]={tools:l};write(e,"/angular.json",a);write(e,"/package.json",n);if(!r.skipInstall)o.addTask(new(createRequire(appRequire.resolve("@angular/cli/package.json"))("@angular-devkit/schematics/tasks")).NodePackageInstallTask);o.logger.info("[Buoy] Run npx buoy login to sign in.");return e}}module.exports={ngAdd,setup,defaults};
+`);let y=path.relative(path.dirname(g),p).replace(/\.ts$/,"");if(!y.startsWith("."))y="./"+y;const $=importName(e,g,y,"buoyOptions");let j=e.readText(g);if(!/declare\s+const\s+ngDevMode/.test(j))e.overwrite(g,"declare const ngDevMode: boolean | undefined;\n"+j);providers(e,g,`(typeof ngDevMode === 'undefined' || ngDevMode) ? ${x}(${$}) : []`,x);const T=e.readText(h);if(!T.includes("'@buoy-gg/angular/register'"))e.overwrite(h,"import '@buoy-gg/angular/register';\n"+T);const k=Number(({...n.dependencies,...n.devDependencies}["@angular/core"]||"").match(/\d+/)?.[0]);const c=(i.build.configurations??={}).production??={};const v=path.join(d,"buoy.prod.ts");if(!e.exists(v))e.create(v,"export const buoyOptions = {};\n");c.fileReplacements=[...(c.fileReplacements||[]).filter(f=>f.replace!==p),{replace:p,with:v}];if(k>=20&&!i.build.builder.endsWith(":browser"))c.conditions=[...new Set(["buoy-disabled",...c.conditions||["module","production"]])];else{const f=path.join(d,"buoy-entry.ts"),E=path.join(d,"buoy-entry.prod.ts");if(!e.exists(f))e.create(f,"import '@buoy-gg/angular/register';\nexport { provideBuoy } from '@buoy-gg/angular';\nexport { buoyOptions } from './buoy';\n");if(!e.exists(E))e.create(E,"import { makeEnvironmentProviders } from '@angular/core';\nexport const provideBuoy = (_options?: unknown) => makeEnvironmentProviders([]);\nexport const buoyOptions = {};\n");let w=path.relative(path.dirname(g),f).replace(/\.ts$/,"");if(!w.startsWith("."))w="./"+w;e.overwrite(g,e.readText(g).replace(/from '@buoy-gg\/angular'/,`from '${w}'`).replace(`from '${y}'`,`from '${w}'`));e.overwrite(h,e.readText(h).replace("import '@buoy-gg/angular/register';\n",""));c.fileReplacements=[...(c.fileReplacements||[]).filter(S=>S.replace!==f),{replace:f,with:E}]}}n.devDependencies??={};for(const p of["core",...l]){const m=catalog.find(y=>y.id===p);const b="@buoy-gg/"+p;if(!n.dependencies?.[b]&&!n.devDependencies[b])n.devDependencies[b]="^"+m.version}if(l.includes("react-query")&&!n.dependencies?.["@tanstack/react-query"]&&!n.devDependencies["@tanstack/react-query"]){const p=Object.entries({...n.dependencies,...n.devDependencies}).find(([m])=>m.startsWith("@tanstack/angular-query-"));n.devDependencies["@tanstack/react-query"]=p?.[1]||"^5.0.0"}n.buoy??={};n.buoy.angular??={};n.buoy.angular[t]={tools:l};write(e,"/angular.json",a);write(e,"/package.json",n);if(!r.skipInstall)o.addTask(new(createRequire(appRequire.resolve("@angular/cli/package.json"))("@angular-devkit/schematics/tasks")).NodePackageInstallTask);o.logger.info("[Buoy] Run npx --package=@buoy-gg/core buoy login to sign in.");return e}}module.exports={ngAdd,setup,defaults};

package/lib/schematics/ng-add/tools.json

@@ -1,106 +1,106 @@
 [
   {
     "id": "core",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "env",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "events",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "console",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "time-machine",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "clock",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "permissions",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "lifecycle",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "location",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "ask-buoy",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "network",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "storage",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "route-events",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "react-query",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "redux",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "zustand",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "jotai",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "highlight-updates",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "image-overlay",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "impersonate",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "perf-monitor",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "js-top",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "images",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "assets",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "tv-remote",
-    "version": "7.0.73"
+    "version": "7.0.75"
   },
   {
     "id": "focus-inspector",
-    "version": "7.0.73"
+    "version": "7.0.75"
   }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buoy-gg/angular",
-  "version": "7.0.73",
+  "version": "7.0.75",
   "description": "Run Buoy in an Angular app.",
   "type": "module",
   "exports": {
@@ -48,8 +48,8 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-native-web": "^0.21.2",
-    "@buoy-gg/core": "^7.0.73",
-    "@buoy-gg/shared-ui": "^7.0.73"
+    "@buoy-gg/core": "^7.0.75",
+    "@buoy-gg/shared-ui": "^7.0.75"
   },
   "peerDependencies": {
     "@angular/core": ">=19 <23",