@rivinia/http 0.5.2 → 0.5.3

package/README.md

@@ -239,7 +239,6 @@ import type { Trip } from './trip.service';
 
 @Component({
   selector: 'app-trip-list',
-  standalone: true,
   templateUrl: './trip-list.component.html',
 })
 export class TripListComponent {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivinia/http",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Headless typed HTTP client for Angular: envelope unwrapping, plain Observables and httpResource.",
   "keywords": [
     "angular",
@@ -14,6 +14,7 @@
   "peerDependencies": {
     "@angular/common": "^22.0.0",
     "@angular/core": "^22.0.0",
+    "@angular-devkit/schematics": "^22.0.0",
     "rxjs": "^6.5.3 || ^7.4.0"
   },
   "dependencies": {

package/schematics/ng-add/index.cjs

@@ -38,11 +38,11 @@ function ngAdd(options) {
         // the schematic emits no unwrap configuration. URLs are never touched:
         // the caller owns them (environment, joinUrl, …).
         let changed = false;
-        if (!content.includes(HTTP_CLIENT_IMPORT)) {
+        if (!importsValue(content, '@angular/common/http', 'provideHttpClient')) {
             content = insertAfterLastImport(content, HTTP_CLIENT_IMPORT);
             changed = true;
         }
-        if (!content.includes(PROVIDE_HTTP_IMPORT)) {
+        if (!importsValue(content, '@rivinia/http', 'provideRiviniaHttp')) {
             content = insertAfterLastImport(content, PROVIDE_HTTP_IMPORT);
             changed = true;
         }
@@ -115,3 +115,33 @@ function insertProvider(content, call) {
     const at = match.index + match[0].length;
     return `${content.slice(0, at)}\n    ${call},${content.slice(at)}`;
 }
+/**
+ * Whether the file already binds `symbol` as a VALUE imported from `module`.
+ *
+ * A plain `content.includes(IMPORT_LINE)` recognises only ONE shape of the
+ * import — `import { symbol } from 'module';`. An app that imports the
+ * symbol beside others (`import { other, symbol } from 'module';`) would be
+ * given a SECOND import of the same symbol, and its build would then fail
+ * with "Duplicate identifier" (TS2300).
+ *
+ * An aliased or a type-only import does not bind the name we need, so it
+ * does not count as present.
+ */
+function importsValue(content, module, symbol) {
+    const pattern = /import\s+(?:type\s+)?\{([^}]*)\}\s*from\s*['"]([^'"]+)['"]/g;
+    for (const match of content.matchAll(pattern)) {
+        if (match[2] !== module)
+            continue;
+        if (/^\s*import\s+type\s/.test(match[0]))
+            continue; // a type-only import
+        for (const entry of match[1].split(',')) {
+            const raw = entry.trim();
+            if (!raw || /^type\s/.test(raw))
+                continue; // a type-only specifier
+            const local = raw.split(/\s+as\s+/).pop().trim();
+            if (local === symbol)
+                return true;
+        }
+    }
+    return false;
+}