spotcharge-types 1.0.362 → 1.0.364

package/dist/models/api/catalog/vehicle.api.model.d.ts

@@ -14,6 +14,7 @@ export interface PublicVehicleListItemApiModel {
     image: string | null;
     batteryCapacity: number | null;
     type: VehicleTypeCatalog;
+    year: number | null;
     brand: PublicVehicleBrandEmbedApiModel;
 }
 export interface AdminVehicleListItemApiModel {
@@ -24,6 +25,7 @@ export interface AdminVehicleListItemApiModel {
     type: VehicleTypeCatalog;
     vehicleBrandId: string;
     isActive: boolean;
+    year: number | null;
     brand: AdminVehicleBrandListItemApiModel;
     createdAt: string;
 }

package/dist/models/api/catalog/vehicle.api.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vehicle.api.model.d.ts","sourceRoot":"","sources":["../../../../src/models/api/catalog/vehicle.api.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EACL,iCAAiC,EAElC,MAAM,2BAA2B,CAAC;AAEnC,uDAAuD;AACvD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,WAAW,CAAC;AAEvD,MAAM,WAAW,+BAA+B;IAC9C,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,kBAAkB,CAAC;IACzB,KAAK,EAAE,+BAA+B,CAAC;CACxC;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,kBAAkB,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,iCAAiC,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,6BAA6B,EAAE,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,aAAa,EAAE,gBAAgB,CAAC;CACjC;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,4BAA4B,EAAE,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,aAAa,EAAE,gBAAgB,CAAC;CACjC;AAED,MAAM,WAAW,0BACf,SAAQ,IAAI,CAAC,4BAA4B,EAAE,OAAO,GAAG,WAAW,CAAC,EAC/D,uBAAuB;IACzB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,KAAK,EAAE,+BAA+B,CAAC;IACvC,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"vehicle.api.model.d.ts","sourceRoot":"","sources":["../../../../src/models/api/catalog/vehicle.api.model.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spotcharge-types",
-  "version": "1.0.362",
+  "version": "1.0.364",
   "description": "Spotcharge typesn",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/models/api/catalog/vehicle.api.model.ts

@@ -20,6 +20,7 @@ export interface PublicVehicleListItemApiModel {
   image: string | null;
   batteryCapacity: number | null;
   type: VehicleTypeCatalog;
+  year: number | null;
   brand: PublicVehicleBrandEmbedApiModel;
 }
 
@@ -31,6 +32,7 @@ export interface AdminVehicleListItemApiModel {
   type: VehicleTypeCatalog;
   vehicleBrandId: string;
   isActive: boolean;
+  year: number | null;
   brand: AdminVehicleBrandListItemApiModel;
   createdAt: string;
 }

package/sync-types-to-repos.sh

@@ -1,15 +1,8 @@
 #!/usr/bin/env bash
 #
-# Build local spotcharge-types and copy it into sibling project node_modules.
-# Never runs `npm install file:...` — that writes file:../spotcharge-types into
-# package.json and lockfiles, and some npm versions ignore --no-save.
-#
-# Bumps the local patch version first so unpublished work is not stuck on an
-# already-published number (npm install / IDEs treat that as "already have it").
-# Skip the bump with SYNC_NO_BUMP=1.
-#
-# Discovers sibling packages that depend on spotcharge-types (skips git/gitlab
-# specs). Pins each package.json to ^<version> and copies dist + src.
+# Remove each sibling's node_modules/spotcharge-types, then install the
+# published latest from npm. Does not copy the local tree and does not
+# write file: specs.
 #
 # Usage (from spotcharge-types):
 #   ./sync-types-to-repos.sh
@@ -35,26 +28,6 @@ fail() {
   exit 1
 }
 
-read_types_version() {
-  node -p "require('$TYPES_DIR/package.json').version"
-}
-
-bump_local_patch() {
-  if [[ "${SYNC_NO_BUMP:-}" == "1" ]]; then
-    log "SYNC_NO_BUMP=1 — keeping spotcharge-types@$(read_types_version)"
-    return 0
-  fi
-
-  local before after
-  before="$(read_types_version)"
-  log "Bumping patch ${before} → next (unpublished local sync)..."
-  cd "$TYPES_DIR" || fail "cannot cd to $TYPES_DIR"
-  npm version patch --no-git-tag-version >/dev/null
-  after="$(read_types_version)"
-  log "  ${GREEN}${before} → ${after}${NC}"
-}
-
-# Sibling packages with a semver/file: spotcharge-types dep. Skips git hosts.
 discover_targets() {
   node - "$PROJECTS_ROOT" "$TYPES_DIR" <<'EOF'
 const fs = require('fs');
@@ -112,155 +85,63 @@ process.stdout.write(out.join('\n') + (out.length ? '\n' : ''));
 EOF
 }
 
-# Surgical string replace — do not JSON.parse/stringify lockfiles (preserves formatting).
-pin_types_spec() {
+remove_installed_types() {
   local project_dir="$1"
-  local published_spec="$2"
-  local types_version="$3"
-  node - "$project_dir" "$published_spec" "$types_version" <<'EOF'
-const fs = require('fs');
-const path = require('path');
-
-const projectDir = process.argv[2];
-const publishedSpec = process.argv[3];
-const typesVersion = process.argv[4];
-const files = ['package.json', 'package-lock.json', 'npm-shrinkwrap.json'];
-
-const pinSpecs = (raw) =>
-  raw
-    .replace(/("spotcharge-types"\s*:\s*)"(file:[^"]+|\^?\d+\.\d+\.\d+)"/g, `$1"${publishedSpec}"`)
-    .replace(/\n    "\.\.(?:\/\.\.)*\/spotcharge-types": \{[\s\S]*?\n    \},/g, '')
-    .replace(
-      /    "node_modules\/spotcharge-types": \{\s*"resolved": "(?:\.\.\/)+spotcharge-types",\s*"link": true\s*\}/g,
-      [
-        '    "node_modules/spotcharge-types": {',
-        `      "version": "${typesVersion}",`,
-        '      "license": "ISC"',
-        '    }',
-      ].join('\n')
-    );
-
-const changed = [];
-for (const name of files) {
-  const filePath = path.join(projectDir, name);
-  if (!fs.existsSync(filePath)) {
-    continue;
-  }
-  const raw = fs.readFileSync(filePath, 'utf8');
-  const next = pinSpecs(raw);
-  if (next !== raw) {
-    fs.writeFileSync(filePath, next);
-    changed.push(name);
-  }
-}
-
-if (changed.length) {
-  process.stdout.write(`pinned spotcharge-types@${publishedSpec} in ${changed.join(', ')}\n`);
-}
-EOF
-}
+  local dest="$project_dir/node_modules/spotcharge-types"
 
-has_file_spec() {
-  local file_path="$1"
-  [[ -f "$file_path" ]] && grep -qE '"spotcharge-types"[[:space:]]*:[[:space:]]*"file:' "$file_path"
-}
+  shopt -s nullglob
+  rm -rf "$project_dir"/node_modules/.spotcharge-types-*
+  shopt -u nullglob
 
-copy_types_into_node_modules() {
-  local project_dir="$1"
-  local dest="$project_dir/node_modules/spotcharge-types"
-  local tmp="${dest}.syncing.$$"
-
-  mkdir -p "$project_dir/node_modules"
-  rm -rf "$tmp"
-  mkdir -p "$tmp/dist"
-  cp "$TYPES_DIR/package.json" "$tmp/package.json"
-  cp -R "$TYPES_DIR/dist/." "$tmp/dist/"
-  if [[ -d "$TYPES_DIR/src" ]]; then
-    mkdir -p "$tmp/src"
-    cp -R "$TYPES_DIR/src/." "$tmp/src/"
+  if [[ ! -e "$dest" ]]; then
+    log "  no node_modules/spotcharge-types"
+    return 0
   fi
 
-  mkdir -p "$dest"
-  # Replace package files in place. Ignore leftover .cursor/.idea — those get
-  # copied into node_modules when dest was once a full-repo copy, and the
-  # sandbox/IDE often locks them so `rm -rf dest` cannot finish.
-  if command -v rsync >/dev/null 2>&1; then
-    rsync -a --delete --exclude '.cursor/' --exclude '.idea/' "$tmp/" "$dest/"
-  else
-    rm -rf "$dest/dist" "$dest/src" "$dest/package.json"
-    cp "$tmp/package.json" "$dest/package.json"
-    cp -R "$tmp/dist" "$dest/dist"
-    if [[ -d "$tmp/src" ]]; then
-      cp -R "$tmp/src" "$dest/src"
-    fi
+  chmod -R u+w "$dest" 2>/dev/null || true
+  rm -rf "$dest"
+  if [[ -e "$dest" ]]; then
+    fail "could not remove $dest (file busy?). Close anything watching that folder and retry."
   fi
-  rm -rf "$tmp"
-  rm -rf "$dest/.cursor" "$dest/.idea" 2>/dev/null || true
+  log "  removed node_modules/spotcharge-types"
 }
 
-verify_copy() {
+install_latest() {
   local project_dir="$1"
-  local label="$2"
-  local types_version="$3"
-  local published_spec="$4"
-  node - "$project_dir" "$label" "$types_version" "$published_spec" "$TYPES_DIR" <<'EOF'
-const fs = require('fs');
-const path = require('path');
+  local latest="$2"
 
-const projectDir = process.argv[2];
-const label = process.argv[3];
-const typesVersion = process.argv[4];
-const publishedSpec = process.argv[5];
-const typesDir = process.argv[6];
-const dest = path.join(projectDir, 'node_modules', 'spotcharge-types');
-const issues = [];
-
-const pkg = JSON.parse(fs.readFileSync(path.join(projectDir, 'package.json'), 'utf8'));
-const spec =
-  (pkg.dependencies && pkg.dependencies['spotcharge-types']) ||
-  (pkg.devDependencies && pkg.devDependencies['spotcharge-types']);
-if (spec !== publishedSpec) {
-  issues.push(`package.json spec is ${spec}, expected ${publishedSpec}`);
-}
+  log "  npm install spotcharge-types@${latest}"
+  cd "$project_dir" || fail "cannot cd to $project_dir"
 
-if (!fs.existsSync(path.join(dest, 'package.json'))) {
-  issues.push('node_modules/spotcharge-types missing');
-} else {
-  const copied = JSON.parse(fs.readFileSync(path.join(dest, 'package.json'), 'utf8'));
-  if (copied.version !== typesVersion) {
-    issues.push(`copied version ${copied.version} != ${typesVersion}`);
-  }
-}
+  if npm install "spotcharge-types@${latest}"; then
+    return 0
+  fi
 
-for (const rel of ['dist/index.js', 'dist/index.d.ts']) {
-  if (!fs.existsSync(path.join(dest, rel))) {
-    issues.push(`missing ${rel}`);
-  }
+  log "  ${YELLOW}retrying with --legacy-peer-deps${NC}"
+  npm install --legacy-peer-deps "spotcharge-types@${latest}"
 }
 
-if (fs.existsSync(path.join(typesDir, 'src')) && !fs.existsSync(path.join(dest, 'src'))) {
-  issues.push('missing src (needed for declaration maps)');
-}
+verify_installed() {
+  local project_dir="$1"
+  local label="$2"
+  local latest="$3"
+  local dest="$project_dir/node_modules/spotcharge-types/package.json"
 
-const catalogSrc = path.join(typesDir, 'dist', 'models', 'api', 'catalog', 'index.d.ts');
-const catalogDest = path.join(dest, 'dist', 'models', 'api', 'catalog', 'index.d.ts');
-if (fs.existsSync(catalogSrc) && !fs.existsSync(catalogDest)) {
-  issues.push('missing catalog d.ts');
-}
+  if [[ ! -f "$dest" ]]; then
+    fail "$label — spotcharge-types missing after install"
+  fi
 
-if (issues.length) {
-  process.stderr.write(`${label}: ${issues.join('; ')}\n`);
-  process.exit(1);
-}
-EOF
+  local installed
+  installed="$(node -p "require('$dest').version")"
+  if [[ "$installed" != "$latest" ]]; then
+    fail "$label — installed ${installed}, expected ${latest}"
+  fi
 }
 
 install_types_in() {
   local project_dir="$1"
   local label="$2"
-  local types_version="$3"
-  local published_spec="$4"
-  local pin_out
+  local latest="$3"
 
   if [[ ! -d "$project_dir" ]]; then
     log "${YELLOW}SKIP${NC} $label — directory not found: $project_dir"
@@ -273,37 +154,18 @@ install_types_in() {
   fi
 
   log "\n${GREEN}==>${NC} $label"
-
-  pin_out="$(pin_types_spec "$project_dir" "$published_spec" "$types_version")"
-  if [[ -n "$pin_out" ]]; then
-    log "  ${YELLOW}${pin_out}${NC}"
-  fi
-
-  if has_file_spec "$project_dir/package.json"; then
-    log "  ${RED}file: spec still present in package.json${NC}"
-    return 1
-  fi
-
-  log "  copying spotcharge-types@${types_version} into node_modules"
-  copy_types_into_node_modules "$project_dir"
-  verify_copy "$project_dir" "$label" "$types_version" "$published_spec"
-  log "  ${GREEN}ok${NC}"
+  remove_installed_types "$project_dir"
+  install_latest "$project_dir" "$latest"
+  verify_installed "$project_dir" "$label" "$latest"
+  log "  ${GREEN}ok${NC} spotcharge-types@${latest}"
 }
 
 main() {
-  cd "$TYPES_DIR" || fail "cannot cd to $TYPES_DIR"
-  bump_local_patch
-
-  local types_version published_spec
-  types_version="$(read_types_version)"
-  published_spec="^${types_version}"
-
-  log "Building spotcharge-types@${types_version}..."
-  npm start || fail "types build failed (npm start)"
-
-  if [[ ! -f "$TYPES_DIR/dist/index.js" ]]; then
-    fail "build output missing: dist/index.js — run npm start in spotcharge-types first"
-  fi
+  local latest
+  log "Resolving latest spotcharge-types from npm..."
+  latest="$(npm view spotcharge-types version)"
+  [[ -n "$latest" ]] || fail "npm view spotcharge-types version returned empty"
+  log "  latest is ${GREEN}${latest}${NC}"
 
   local targets=()
   local line
@@ -320,16 +182,15 @@ main() {
   local failed=0
   local target
   for target in "${targets[@]}"; do
-    install_types_in "$PROJECTS_ROOT/$target" "$target" "$types_version" "$published_spec" || failed=$((failed + 1))
+    install_types_in "$PROJECTS_ROOT/$target" "$target" "$latest" || failed=$((failed + 1))
   done
 
   log ""
   if [[ "$failed" -gt 0 ]]; then
-    fail "$failed project(s) failed to install spotcharge-types"
+    fail "$failed project(s) failed to install spotcharge-types@${latest}"
   fi
 
-  log "${GREEN}Done.${NC} spotcharge-types@${types_version} synced."
-  log "package.json uses ${published_spec}. Do not npm install in consumers until this version is published, or re-run sync-repos after."
+  log "${GREEN}Done.${NC} spotcharge-types@${latest} installed from npm."
 }
 
 main "$@"