@typespec/versioning 0.43.0-dev.5 → 0.43.0-dev.7

package/dist/src/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,OAAO,EAER,MAAM,oBAAoB,CAAC;AAa5B,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QA+G3C"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,OAAO,EAER,MAAM,oBAAoB,CAAC;AAa5B,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QA8H3C"}

package/dist/src/validate.js

@@ -32,15 +32,23 @@ export function $onValidate(program) {
             }
         },
         union: (union) => {
+            // If this is an instantiated type we don't want to keep the mapping.
+            if (isTemplateInstance(union)) {
+                return;
+            }
             if (union.namespace === undefined) {
                 return;
             }
-            for (const option of union.options.values()) {
-                addDependency(union.namespace, option);
+            for (const variant of union.variants.values()) {
+                addDependency(union.namespace, variant.type);
             }
         },
         operation: (op) => {
             var _a, _b;
+            // If this is an instantiated type we don't want to keep the mapping.
+            if (isTemplateInstance(op)) {
+                return;
+            }
             const namespace = (_a = op.namespace) !== null && _a !== void 0 ? _a : (_b = op.interface) === null || _b === void 0 ? void 0 : _b.namespace;
             addDependency(namespace, op.parameters);
             addDependency(namespace, op.returnType);
@@ -48,7 +56,12 @@ export function $onValidate(program) {
                 // Validate model -> property have correct versioning
                 validateTargetVersionCompatible(program, op.interface, op, { isTargetADependent: true });
             }
-            validateTargetVersionCompatible(program, op, op.returnType);
+            validateReference(program, op, op.returnType);
+        },
+        interface: (iface) => {
+            for (const source of iface.sourceInterfaces) {
+                validateReference(program, iface, source);
+            }
         },
         namespace: (namespace) => {
             const versionedNamespace = findVersionedNamespace(program, namespace);
@@ -164,12 +177,25 @@ function validateMadeOptional(program, target) {
  * @param target Type being referenced from the source
  */
 function validateReference(program, source, target) {
+    var _a, _b;
     validateTargetVersionCompatible(program, source, target);
-    if (target.kind === "Model" && target.templateArguments) {
-        for (const param of target.templateArguments) {
+    if ("templateMapper" in target) {
+        for (const param of (_b = (_a = target.templateMapper) === null || _a === void 0 ? void 0 : _a.args) !== null && _b !== void 0 ? _b : []) {
             validateTargetVersionCompatible(program, source, param);
         }
     }
+    switch (target.kind) {
+        case "Union":
+            for (const variant of target.variants.values()) {
+                validateTargetVersionCompatible(program, source, variant.type);
+            }
+            break;
+        case "Tuple":
+            for (const value of target.values) {
+                validateTargetVersionCompatible(program, source, value);
+            }
+            break;
+    }
 }
 function getAvailabilityMapWithParentInfo(program, type) {
     const base = getAvailabilityMap(program, type);

package/dist/src/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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"}

package/lib/versioning.tsp

@@ -5,10 +5,12 @@ using TypeSpec.Versioning;
 
 #suppress "projections-are-experimental"
 projection op#v {
-  to(version) {
+  pre to(version) {
     if !existsAtVersion(self, version) {
       return never;
     };
+  }
+  to(version) {
     if hasDifferentNameAtVersion(self, version) {
       self::rename(getNameAtVersion(self, version));
     };
@@ -16,10 +18,12 @@ projection op#v {
       self::changeReturnType(getReturnTypeBeforeVersion(self, version));
     };
   }
-  from(version) {
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
     };
+  }
+  from(version) {
     if hasDifferentNameAtVersion(self, version) {
       self::rename(self::projectionBase::name);
     };
@@ -28,10 +32,12 @@ projection op#v {
 
 #suppress "projections-are-experimental"
 projection interface#v {
-  to(version) {
+  pre to(version) {
     if !existsAtVersion(self, version) {
       return never;
     };
+  }
+  to(version) {
     if hasDifferentNameAtVersion(self, version) {
       self::rename(getNameAtVersion(self, version));
     };
@@ -44,157 +50,190 @@ projection interface#v {
       };
     });
   }
-  from(version) {
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(self::projectionBase::name);
-      };
-
-      self::projectionBase::operations::forEach((operation) => {
-        if !existsAtVersion(operation, version) {
-          self::addOperation(operation::name, operation::parameters, operation::returnType);
-        };
-      });
     };
   }
+  from(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(self::projectionBase::name);
+    };
+
+    self::projectionBase::operations::forEach((operation) => {
+      if !existsAtVersion(operation, version) {
+        self::addOperation(operation::name, operation::parameters, operation::returnType);
+      };
+    });
+  }
 }
 
 #suppress "projections-are-experimental"
 projection union#v {
-  to(version) {
+  pre to(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(getNameAtVersion(self, version));
+    };
+  }
+  to(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(getNameAtVersion(self, version));
+    };
+
+    self::variants::forEach((variant) => {
+      if hasDifferentNameAtVersion(variant, version) {
+        self::renameVariant(variant::name, getNameAtVersion(variant, version));
+      };
+    });
+  }
+  from(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(self::projectionBase::name);
+    };
+
+    self::projectionBase::variants::forEach((variant) => {
+      if !existsAtVersion(variant, version) {
+        self::addVariant(variant::name, variant::type);
+      } else if hasDifferentNameAtVersion(variant, version) {
+        self::renameVariant(getNameAtVersion(variant, version), variant::name);
       };
+    });
+  }
+}
 
-      self::variants::forEach((variant) => {
-        if !existsAtVersion(variant, version) {
-          self::deleteVariant(variant::name);
-        } else if hasDifferentNameAtVersion(variant, version) {
-          self::renameVariant(variant::name, getNameAtVersion(variant, version));
-        };
-      });
+#suppress "projections-are-experimental"
+projection unionvariant#v {
+  pre to(version) {
+    if !existsAtVersion(self, version) {
+      return never;
     };
   }
-  from(version) {
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(self::projectionBase::name);
-      };
-
-      self::projectionBase::variants::forEach((variant) => {
-        if !existsAtVersion(variant, version) {
-          self::addVariant(variant::name, variant::type);
-        } else if hasDifferentNameAtVersion(variant, version) {
-          self::renameVariant(getNameAtVersion(variant, version), variant::name);
-        };
-      });
     };
   }
 }
 
 #suppress "projections-are-experimental"
 projection model#v {
-  to(version) {
+  pre to(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(getNameAtVersion(self, version));
+    };
+  }
+  to(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(getNameAtVersion(self, version));
+    };
+    self::properties::forEach((p) => {
+      if hasDifferentNameAtVersion(p, version) {
+        self::renameProperty(p::name, getNameAtVersion(p, version));
       };
 
-      self::properties::forEach((p) => {
-        if !existsAtVersion(p, version) {
-          self::deleteProperty(p::name);
-        };
-
-        if hasDifferentNameAtVersion(p, version) {
-          self::renameProperty(p::name, getNameAtVersion(p, version));
-        };
-
-        if madeOptionalAfter(p, version) {
-          p::setOptional(false);
-        };
+      if madeOptionalAfter(p, version) {
+        p::setOptional(false);
+      };
 
-        if hasDifferentTypeAtVersion(p, version) {
-          self::changePropertyType(p::name, getTypeBeforeVersion(p, version));
-        };
-      });
-    };
+      if hasDifferentTypeAtVersion(p, version) {
+        self::changePropertyType(p::name, getTypeBeforeVersion(p, version));
+      };
+    });
   }
-  from(version) {
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(self::projectionBase::name);
+    };
+  }
+  from(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(self::projectionBase::name);
+    };
+
+    self::projectionBase::properties::forEach((p) => {
+      if !existsAtVersion(p, version) {
+        self::addProperty(p::name, p::type);
       };
 
-      self::projectionBase::properties::forEach((p) => {
-        if !existsAtVersion(p, version) {
-          self::addProperty(p::name, p::type);
-        };
+      if hasDifferentNameAtVersion(p, version) {
+        self::renameProperty(getNameAtVersion(p, version), p::name);
+      };
 
-        if hasDifferentNameAtVersion(p, version) {
-          self::renameProperty(getNameAtVersion(p, version), p::name);
-        };
+      if madeOptionalAfter(p, version) {
+        p::setOptional(true);
+      };
 
-        if madeOptionalAfter(p, version) {
-          p::setOptional(true);
-        };
+      if hasDifferentTypeAtVersion(p, version) {
+        self::changePropertyType(p::name, p::type);
+      };
+    });
+  }
+}
 
-        if hasDifferentTypeAtVersion(p, version) {
-          self::changePropertyType(p::name, p::type);
-        };
-      });
+#suppress "projections-are-experimental"
+projection modelproperty#v {
+  pre to(version) {
+    if !existsAtVersion(self, version) {
+      return never;
+    };
+  }
+  pre from(version) {
+    if !existsAtVersion(self, version) {
+      return never;
     };
   }
 }
 
 #suppress "projections-are-experimental"
 projection enum#v {
+  pre to(version) {
+    if !existsAtVersion(self, version) {
+      return never;
+    };
+  }
   to(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(getNameAtVersion(self, version));
+    };
+
+    self::members::forEach((m) => {
+      if hasDifferentNameAtVersion(m, version) {
+        self::renameMember(m::name, getNameAtVersion(m, version));
+      };
+    });
+  }
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(getNameAtVersion(self, version));
+    };
+  }
+  from(version) {
+    if hasDifferentNameAtVersion(self, version) {
+      self::rename(self::projectionBase::name);
+    };
+
+    self::projectionBase::members::forEach((m) => {
+      if !existsAtVersion(m, version, self::projectionBase) {
+        self::addMember(m::name, m::type);
       };
 
-      self::members::forEach((m) => {
-        if !existsAtVersion(m, version) {
-          self::deleteMember(m::name);
-        };
+      if hasDifferentNameAtVersion(m, version, self::projectionBase) {
+        self::renameMember(getNameAtVersion(m, version), m::name);
+      };
+    });
+  }
+}
 
-        if hasDifferentNameAtVersion(m, version) {
-          self::renameMember(m::name, getNameAtVersion(m, version));
-        };
-      });
+#suppress "projections-are-experimental"
+projection enummember#v {
+  pre to(version) {
+    if !existsAtVersion(self, version) {
+      return never;
     };
   }
-  from(version) {
+  pre from(version) {
     if !existsAtVersion(self, version) {
       return never;
-    } else {
-      if hasDifferentNameAtVersion(self, version) {
-        self::rename(self::projectionBase::name);
-      };
-
-      self::projectionBase::members::forEach((m) => {
-        if !existsAtVersion(m, version, self::projectionBase) {
-          self::addMember(m::name, m::type);
-        };
-
-        if hasDifferentNameAtVersion(m, version, self::projectionBase) {
-          self::renameMember(getNameAtVersion(m, version), m::name);
-        };
-      });
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/versioning",
-  "version": "0.43.0-dev.5",
+  "version": "0.43.0-dev.7",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for declaring and emitting versioned APIs",
   "homepage": "https://microsoft.github.io/typespec",