@typespec/compiler 1.1.0-dev.2 → 1.1.0-dev.21

package/dist/manifest.js

@@ -1,4 +1,4 @@
 export default {
-  "version": "1.1.0-dev.2",
-  "commit": "c4b3351d1a9e96632516c7ccdaf6b2ac08a3e1ae"
+  "version": "1.1.0-dev.21",
+  "commit": "ae3cf415aea7bf7aec0f7d7ad176169fdcf2df1c"
 };

package/dist/src/core/checker.d.ts

@@ -49,6 +49,12 @@ export interface Checker {
      */
     getValueExactType(value: Value): Type | undefined;
 }
+export interface CheckerStats {
+    /** Number of types created */
+    createdTypes: number;
+    /** Number of types finished */
+    finishedTypes: number;
+}
 interface TypePrototype {
 }
 export interface TypeSpecCompletionItem {

package/dist/src/core/checker.d.ts.map

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

package/dist/src/core/checker.js

@@ -25,6 +25,10 @@ import { IdentifierKind, ResolutionResultFlags, SyntaxKind, } from "./types.js";
 const TypeInstantiationMap = class extends MultiKeyMap {
 };
 export function createChecker(program, resolver) {
+    const stats = {
+        createdTypes: 0,
+        finishedTypes: 0,
+    };
     const stdTypes = {};
     const indeterminateEntities = new WeakMap();
     const docFromCommentForSym = new Map();
@@ -83,6 +87,7 @@ export function createChecker(program, resolver) {
         getValueExactType,
         getTemplateParameterUsageMap,
         isTypeAssignableTo: undefined,
+        stats,
     };
     const relation = createTypeRelationChecker(program, checker);
     checker.isTypeAssignableTo = relation.isTypeAssignableTo;
@@ -233,7 +238,7 @@ export function createChecker(program, resolver) {
         }
         return entity;
     }
-    function getValueForNode(node, mapper, constraint, options = {}) {
+    function getValueForNode(node, mapper, constraint) {
         const initial = checkNode(node, mapper, constraint);
         if (initial === null) {
             return null;
@@ -245,15 +250,23 @@ export function createChecker(program, resolver) {
         else {
             entity = initial;
         }
-        // if (options.legacyTupleAndModelCast && entity !== null && isType(entity)) {
-        //   entity = legacy_tryTypeToValueCast(entity, constraint, node);
-        // }
         if (entity === null) {
             return null;
         }
         if (isValue(entity)) {
             return constraint ? inferScalarsFromConstraints(entity, constraint.type) : entity;
         }
+        // If a template parameter that can be a value is used in a template declaration then we allow it but we return null because we don't have an actual value.
+        if (entity.kind === "TemplateParameter" &&
+            entity.constraint?.valueType &&
+            entity.constraint.type === undefined &&
+            mapper === undefined) {
+            return createValue({
+                entityKind: "Value",
+                valueKind: "TemplateValue",
+                type: entity.constraint.valueType,
+            }, entity.constraint.valueType);
+        }
         reportExpectedValue(node, entity);
         return null;
     }
@@ -2308,7 +2321,7 @@ export function createChecker(program, resolver) {
                 const spanValue = createTemplateSpanValue(span.expression, type);
                 spans.push(spanValue);
                 const spanValueAsString = stringifyTypeForTemplate(type);
-                if (spanValueAsString) {
+                if (spanValueAsString !== undefined) {
                     stringValue += spanValueAsString;
                 }
                 else {
@@ -3232,7 +3245,8 @@ export function createChecker(program, resolver) {
             }));
             return undefined;
         }
-        if (heritageRef.kind !== SyntaxKind.TypeReference) {
+        if (heritageRef.kind !== SyntaxKind.TypeReference &&
+            heritageRef.kind !== SyntaxKind.ArrayExpression) {
             reportCheckerDiagnostic(createDiagnostic({
                 code: "extend-model",
                 target: heritageRef,
@@ -3396,7 +3410,7 @@ export function createChecker(program, resolver) {
             pendingResolutions.start(sym, ResolutionKind.Type);
             type.type = getTypeForNode(prop.value, mapper);
             if (prop.default) {
-                const defaultValue = checkDefaultValue(prop.default, type.type);
+                const defaultValue = checkDefaultValue(prop.default, type.type, mapper);
                 if (defaultValue !== null) {
                     type.defaultValue = defaultValue;
                 }
@@ -3427,15 +3441,15 @@ export function createChecker(program, resolver) {
             ],
         };
     }
-    function checkDefaultValue(defaultNode, type) {
+    function checkDefaultValue(defaultNode, type, mapper) {
         if (isErrorType(type)) {
             // if the prop type is an error we don't need to validate again.
             return null;
         }
-        const defaultValue = getValueForNode(defaultNode, undefined, {
+        const defaultValue = getValueForNode(defaultNode, mapper, {
             kind: "assignment",
             type,
-        }, { legacyTupleAndModelCast: true });
+        });
         if (defaultValue === null) {
             return null;
         }
@@ -3444,6 +3458,11 @@ export function createChecker(program, resolver) {
             reportCheckerDiagnostics(diagnostics);
             return null;
         }
+        else if (defaultValue.valueKind === "TemplateValue") {
+            // Right now we don't want to expose `TemplateValue` in the type graph.
+            // And as interating with the template declaration is not a supported feature we can just drop it.
+            return null;
+        }
         else {
             return { ...defaultValue, type };
         }
@@ -4253,6 +4272,7 @@ export function createChecker(program, resolver) {
      * Given the own-properties of a type, returns a fully-initialized type.
      */
     function createType(typeDef) {
+        stats.createdTypes++;
         Object.setPrototypeOf(typeDef, typePrototype);
         typeDef.isFinished = false;
         // If the type has an associated syntax node, check any directives that
@@ -4265,6 +4285,7 @@ export function createChecker(program, resolver) {
         return createdType;
     }
     function finishType(typeDef) {
+        stats.finishedTypes++;
         return finishTypeForProgramAndChecker(program, typePrototype, typeDef);
     }
     function getLiteralType(node) {
@@ -4735,9 +4756,8 @@ export function finishTypeForProgram(program, typeDef) {
 }
 function linkMapper(typeDef, mapper) {
     if (mapper) {
-        compilerAssert(!typeDef.templateArguments, "Mapper provided but template arguments already set.");
+        compilerAssert(!typeDef.templateMapper, "Mapper provided but template arguments already set.");
         typeDef.templateMapper = mapper;
-        typeDef.templateArguments = mapper.args;
     }
 }
 function extractMainDoc(type) {