patch of [Breaking] Add @default decorator, uninline scalars by default · round #1 · pull #5 · danabra.mov/typelex

+17

packages/emitter/src/decorators.ts

···

       25
       25
        
       const maxBytesKey = Symbol("maxBytes");

     

       26
       26
        
       const minBytesKey = Symbol("minBytes");

     

       27
       27
        
       const externalKey = Symbol("external");

     

       28
       28
       +
       const defaultKey = Symbol("default");

     

       28
       29
        
       

     

       29
       30
        
       /**

     

       30
       31
        
        * @maxBytes decorator for maximum length of bytes type

     
···

       296
       297
        
         return program.stateSet(readOnlyKey).has(target);

     

       297
       298
        
       }

     

       298
       299
        
       

     

       300
       300
       +
       /**

     

       301
       301
       +
        * @default decorator for setting default values on scalars and unions

     

       302
       302
       +
        * The value can be a literal (string, number, boolean) or a model reference for tokens

     

       303
       303
       +
        */

     

       304
       304
       +
       export function $default(context: DecoratorContext, target: Type, value: any) {

     

       305
       305
       +
         // Just store the raw value - let the emitter handle unwrapping and validation

     

       306
       306
       +
         context.program.stateMap(defaultKey).set(target, value);

     

       307
       307
       +
       }

     

       308
       308
       +
       

     

       309
       309
       +
       export function getDefault(

     

       310
       310
       +
         program: Program,

     

       311
       311
       +
         target: Type,

     

       312
       312
       +
       ): any | undefined {

     

       313
       313
       +
         return program.stateMap(defaultKey).get(target);

     

       314
       314
       +
       }

     

       315
       315
       +
       

     

       299
       316
        
       /**

     

       300
       317
        
        * @external decorator for marking a namespace as external

     

       301
       318
        
        * External namespaces are skipped during emission and don't produce JSON files

packages/emitter/src/tsp-index.ts

···

       15
       15
        
         $maxBytes,

     

       16
       16
        
         $minBytes,

     

       17
       17
        
         $external,

     

       18
       18
       +
         $default,

     

       18
       19
        
       } from "./decorators.js";

     

       19
       20
        
       

     

       20
       21
        
       /** @internal */

     
···

       36
       37
        
           maxBytes: $maxBytes,

     

       37
       38
        
           minBytes: $minBytes,

     

       38
       39
        
           external: $external,

     

       40
       40
       +
           default: $default,

     

       39
       41
        
         },

     

       40
       42
        
       };

packages/emitter/test/integration/atproto/input/app/bsky/actor/defs.tsp

···

       232
       232
        
           prioritizeFollowedUsers?: boolean;

     

       233
       233
        
         }

     

       234
       234
        
       

     

       235
       235
       +
         @inline

     

       235
       236
        
         @maxLength(640)

     

       236
       237
        
         @maxGraphemes(64)

     

       237
       238
        
         scalar InterestTag extends string;

     
···

       292
       293
        
           @required did: did;

     

       293
       294
        
         }

     

       294
       295
        
       

     

       296
       296
       +
         @inline

     

       295
       297
        
         @maxLength(100)

     

       296
       298
        
         scalar NudgeToken extends string;

     

       297
       299

+30

packages/emitter/test/spec/basic/input/com/example/scalarDefaults.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace com.example.scalarDefaults {

     

       4
       4
       +
         /** Test default decorator on scalars */

     

       5
       5
       +
         model Main {

     

       6
       6
       +
           /** Uses string scalar with default */

     

       7
       7
       +
           mode?: Mode;

     

       8
       8
       +
       

     

       9
       9
       +
           /** Uses integer scalar with default */

     

       10
       10
       +
           limit?: Limit;

     

       11
       11
       +
       

     

       12
       12
       +
           /** Uses boolean scalar with default */

     

       13
       13
       +
           enabled?: Enabled;

     

       14
       14
       +
         }

     

       15
       15
       +
       

     

       16
       16
       +
         /** A string type with a default value */

     

       17
       17
       +
         @default("standard")

     

       18
       18
       +
         @maxLength(50)

     

       19
       19
       +
         scalar Mode extends string;

     

       20
       20
       +
       

     

       21
       21
       +
         /** An integer type with a default value */

     

       22
       22
       +
         @default(50)

     

       23
       23
       +
         @minValue(1)

     

       24
       24
       +
         @maxValue(100)

     

       25
       25
       +
         scalar Limit extends integer;

     

       26
       26
       +
       

     

       27
       27
       +
         /** A boolean type with a default value */

     

       28
       28
       +
         @default(true)

     

       29
       29
       +
         scalar Enabled extends boolean;

     

       30
       30
       +
       }

+22

packages/emitter/test/spec/basic/input/com/example/scalarDefs.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace com.example.scalarDefs {

     

       4
       4
       +
         /** Scalar defs should create standalone defs like models and unions */

     

       5
       5
       +
         model Main {

     

       6
       6
       +
           /** Uses a custom string scalar with constraints */

     

       7
       7
       +
           tag?: Tag;

     

       8
       8
       +
       

     

       9
       9
       +
           /** Uses a custom integer scalar with constraints */

     

       10
       10
       +
           count?: Count;

     

       11
       11
       +
         }

     

       12
       12
       +
       

     

       13
       13
       +
         /** A custom string type with length constraints */

     

       14
       14
       +
         @maxLength(100)

     

       15
       15
       +
         @maxGraphemes(50)

     

       16
       16
       +
         scalar Tag extends string;

     

       17
       17
       +
       

     

       18
       18
       +
         /** A custom integer type with value constraints */

     

       19
       19
       +
         @minValue(1)

     

       20
       20
       +
         @maxValue(100)

     

       21
       21
       +
         scalar Count extends integer;

     

       22
       22
       +
       }

+22

packages/emitter/test/spec/basic/input/com/example/scalarInline.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace com.example.scalarInline {

     

       4
       4
       +
         /** Test inline decorator on scalars */

     

       5
       5
       +
         model Main {

     

       6
       6
       +
           /** Inline scalar - should not create a def */

     

       7
       7
       +
           tag?: Tag;

     

       8
       8
       +
       

     

       9
       9
       +
           /** Non-inline scalar - should create a def */

     

       10
       10
       +
           category?: Category;

     

       11
       11
       +
         }

     

       12
       12
       +
       

     

       13
       13
       +
         /** An inline scalar should be inlined at usage sites */

     

       14
       14
       +
         @inline

     

       15
       15
       +
         @maxLength(50)

     

       16
       16
       +
         @maxGraphemes(25)

     

       17
       17
       +
         scalar Tag extends string;

     

       18
       18
       +
       

     

       19
       19
       +
         /** A regular scalar should create a standalone def */

     

       20
       20
       +
         @maxLength(100)

     

       21
       21
       +
         scalar Category extends string;

     

       22
       22
       +
       }

+53

packages/emitter/test/spec/basic/input/com/example/unionDefaults.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace com.example.unionDefaults {

     

       4
       4
       +
         /** Test default decorator on unions */

     

       5
       5
       +
         model Main {

     

       6
       6
       +
           /** Union with token refs and default */

     

       7
       7
       +
           eventMode?: EventMode;

     

       8
       8
       +
       

     

       9
       9
       +
           /** Union with string literals and default */

     

       10
       10
       +
           sortOrder?: SortOrder;

     

       11
       11
       +
       

     

       12
       12
       +
           /** Union with integer literals and default */

     

       13
       13
       +
           priority?: Priority;

     

       14
       14
       +
         }

     

       15
       15
       +
       

     

       16
       16
       +
         /** Union of tokens with default pointing to a token */

     

       17
       17
       +
         @default(Inperson)

     

       18
       18
       +
         union EventMode {

     

       19
       19
       +
           Hybrid,

     

       20
       20
       +
           Inperson,

     

       21
       21
       +
           Virtual,

     

       22
       22
       +
           string,

     

       23
       23
       +
         }

     

       24
       24
       +
       

     

       25
       25
       +
         /** A hybrid event */

     

       26
       26
       +
         @token

     

       27
       27
       +
         model Hybrid {}

     

       28
       28
       +
       

     

       29
       29
       +
         /** An in-person event */

     

       30
       30
       +
         @token

     

       31
       31
       +
         model Inperson {}

     

       32
       32
       +
       

     

       33
       33
       +
         /** A virtual event */

     

       34
       34
       +
         @token

     

       35
       35
       +
         model Virtual {}

     

       36
       36
       +
       

     

       37
       37
       +
         /** Union of string literals with default */

     

       38
       38
       +
         @default("asc")

     

       39
       39
       +
         union SortOrder {

     

       40
       40
       +
           "asc",

     

       41
       41
       +
           "desc",

     

       42
       42
       +
           string,

     

       43
       43
       +
         }

     

       44
       44
       +
       

     

       45
       45
       +
         /** Union of integer literals with default (closed enum) */

     

       46
       46
       +
         @default(1)

     

       47
       47
       +
         @closed

     

       48
       48
       +
         union Priority {

     

       49
       49
       +
           1,

     

       50
       50
       +
           2,

     

       51
       51
       +
           3,

     

       52
       52
       +
         }

     

       53
       53
       +
       }

+45

packages/emitter/test/spec/basic/output/com/example/scalarDefaults.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "com.example.scalarDefaults",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "object",

     

       7
       7
       +
             "properties": {

     

       8
       8
       +
               "mode": {

     

       9
       9
       +
                 "type": "ref",

     

       10
       10
       +
                 "ref": "#mode",

     

       11
       11
       +
                 "description": "Uses string scalar with default"

     

       12
       12
       +
               },

     

       13
       13
       +
               "limit": {

     

       14
       14
       +
                 "type": "ref",

     

       15
       15
       +
                 "ref": "#limit",

     

       16
       16
       +
                 "description": "Uses integer scalar with default"

     

       17
       17
       +
               },

     

       18
       18
       +
               "enabled": {

     

       19
       19
       +
                 "type": "ref",

     

       20
       20
       +
                 "ref": "#enabled",

     

       21
       21
       +
                 "description": "Uses boolean scalar with default"

     

       22
       22
       +
               }

     

       23
       23
       +
             },

     

       24
       24
       +
             "description": "Test default decorator on scalars"

     

       25
       25
       +
           },

     

       26
       26
       +
           "mode": {

     

       27
       27
       +
             "type": "string",

     

       28
       28
       +
             "maxLength": 50,

     

       29
       29
       +
             "default": "standard",

     

       30
       30
       +
             "description": "A string type with a default value"

     

       31
       31
       +
           },

     

       32
       32
       +
           "limit": {

     

       33
       33
       +
             "type": "integer",

     

       34
       34
       +
             "minimum": 1,

     

       35
       35
       +
             "maximum": 100,

     

       36
       36
       +
             "default": 50,

     

       37
       37
       +
             "description": "An integer type with a default value"

     

       38
       38
       +
           },

     

       39
       39
       +
           "enabled": {

     

       40
       40
       +
             "type": "boolean",

     

       41
       41
       +
             "default": true,

     

       42
       42
       +
             "description": "A boolean type with a default value"

     

       43
       43
       +
           }

     

       44
       44
       +
         }

     

       45
       45
       +
       }

+34

packages/emitter/test/spec/basic/output/com/example/scalarDefs.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "com.example.scalarDefs",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "object",

     

       7
       7
       +
             "properties": {

     

       8
       8
       +
               "tag": {

     

       9
       9
       +
                 "type": "ref",

     

       10
       10
       +
                 "ref": "#tag",

     

       11
       11
       +
                 "description": "Uses a custom string scalar with constraints"

     

       12
       12
       +
               },

     

       13
       13
       +
               "count": {

     

       14
       14
       +
                 "type": "ref",

     

       15
       15
       +
                 "ref": "#count",

     

       16
       16
       +
                 "description": "Uses a custom integer scalar with constraints"

     

       17
       17
       +
               }

     

       18
       18
       +
             },

     

       19
       19
       +
             "description": "Scalar defs should create standalone defs like models and unions"

     

       20
       20
       +
           },

     

       21
       21
       +
           "tag": {

     

       22
       22
       +
             "type": "string",

     

       23
       23
       +
             "maxLength": 100,

     

       24
       24
       +
             "maxGraphemes": 50,

     

       25
       25
       +
             "description": "A custom string type with length constraints"

     

       26
       26
       +
           },

     

       27
       27
       +
           "count": {

     

       28
       28
       +
             "type": "integer",

     

       29
       29
       +
             "minimum": 1,

     

       30
       30
       +
             "maximum": 100,

     

       31
       31
       +
             "description": "A custom integer type with value constraints"

     

       32
       32
       +
           }

     

       33
       33
       +
         }

     

       34
       34
       +
       }

+28

packages/emitter/test/spec/basic/output/com/example/scalarInline.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "com.example.scalarInline",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "object",

     

       7
       7
       +
             "properties": {

     

       8
       8
       +
               "tag": {

     

       9
       9
       +
                 "type": "string",

     

       10
       10
       +
                 "maxLength": 50,

     

       11
       11
       +
                 "maxGraphemes": 25,

     

       12
       12
       +
                 "description": "Inline scalar - should not create a def"

     

       13
       13
       +
               },

     

       14
       14
       +
               "category": {

     

       15
       15
       +
                 "type": "ref",

     

       16
       16
       +
                 "ref": "#category",

     

       17
       17
       +
                 "description": "Non-inline scalar - should create a def"

     

       18
       18
       +
               }

     

       19
       19
       +
             },

     

       20
       20
       +
             "description": "Test inline decorator on scalars"

     

       21
       21
       +
           },

     

       22
       22
       +
           "category": {

     

       23
       23
       +
             "type": "string",

     

       24
       24
       +
             "maxLength": 100,

     

       25
       25
       +
             "description": "A regular scalar should create a standalone def"

     

       26
       26
       +
           }

     

       27
       27
       +
         }

     

       28
       28
       +
       }

+61

packages/emitter/test/spec/basic/output/com/example/unionDefaults.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "com.example.unionDefaults",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "object",

     

       7
       7
       +
             "properties": {

     

       8
       8
       +
               "eventMode": {

     

       9
       9
       +
                 "type": "ref",

     

       10
       10
       +
                 "ref": "#eventMode",

     

       11
       11
       +
                 "description": "Union with token refs and default"

     

       12
       12
       +
               },

     

       13
       13
       +
               "sortOrder": {

     

       14
       14
       +
                 "type": "ref",

     

       15
       15
       +
                 "ref": "#sortOrder",

     

       16
       16
       +
                 "description": "Union with string literals and default"

     

       17
       17
       +
               },

     

       18
       18
       +
               "priority": {

     

       19
       19
       +
                 "type": "ref",

     

       20
       20
       +
                 "ref": "#priority",

     

       21
       21
       +
                 "description": "Union with integer literals and default"

     

       22
       22
       +
               }

     

       23
       23
       +
             },

     

       24
       24
       +
             "description": "Test default decorator on unions"

     

       25
       25
       +
           },

     

       26
       26
       +
           "eventMode": {

     

       27
       27
       +
             "type": "string",

     

       28
       28
       +
             "knownValues": [

     

       29
       29
       +
               "com.example.unionDefaults#hybrid",

     

       30
       30
       +
               "com.example.unionDefaults#inperson",

     

       31
       31
       +
               "com.example.unionDefaults#virtual"

     

       32
       32
       +
             ],

     

       33
       33
       +
             "default": "com.example.unionDefaults#inperson",

     

       34
       34
       +
             "description": "Union of tokens with default pointing to a token"

     

       35
       35
       +
           },

     

       36
       36
       +
           "hybrid": {

     

       37
       37
       +
             "type": "token",

     

       38
       38
       +
             "description": "A hybrid event"

     

       39
       39
       +
           },

     

       40
       40
       +
           "inperson": {

     

       41
       41
       +
             "type": "token",

     

       42
       42
       +
             "description": "An in-person event"

     

       43
       43
       +
           },

     

       44
       44
       +
           "virtual": {

     

       45
       45
       +
             "type": "token",

     

       46
       46
       +
             "description": "A virtual event"

     

       47
       47
       +
           },

     

       48
       48
       +
           "sortOrder": {

     

       49
       49
       +
             "type": "string",

     

       50
       50
       +
             "knownValues": ["asc", "desc"],

     

       51
       51
       +
             "default": "asc",

     

       52
       52
       +
             "description": "Union of string literals with default"

     

       53
       53
       +
           },

     

       54
       54
       +
           "priority": {

     

       55
       55
       +
             "type": "integer",

     

       56
       56
       +
             "enum": [1, 2, 3],

     

       57
       57
       +
             "default": 1,

     

       58
       58
       +
             "description": "Union of integer literals with default (closed enum)"

     

       59
       59
       +
           }

     

       60
       60
       +
         }

     

       61
       61
       +
       }

+164 -1

DOCS.md

···

       312
       312
        
       

     

       313
       313
        
       Note that `Caption` won't exist as a separate def—the abstraction is erased in the output.

     

       314
       314
        
       

     

       315
       315
       +
       ### Scalars

     

       316
       316
       +
       

     

       317
       317
       +
       TypeSpec scalars let you create named types with constraints. **By default, scalars create standalone defs** (like models):

     

       318
       318
       +
       

     

       319
       319
       +
       ```typescript

     

       320
       320
       +
       import "@typelex/emitter";

     

       321
       321
       +
       

     

       322
       322
       +
       namespace com.example {

     

       323
       323
       +
         model Main {

     

       324
       324
       +
           handle?: Handle;

     

       325
       325
       +
           bio?: Bio;

     

       326
       326
       +
         }

     

       327
       327
       +
       

     

       328
       328
       +
         @maxLength(50)

     

       329
       329
       +
         scalar Handle extends string;

     

       330
       330
       +
       

     

       331
       331
       +
         @maxLength(256)

     

       332
       332
       +
         @maxGraphemes(128)

     

       333
       333
       +
         scalar Bio extends string;

     

       334
       334
       +
       }

     

       335
       335
       +
       ```

     

       336
       336
       +
       

     

       337
       337
       +
       This creates three defs: `main`, `handle`, and `bio`:

     

       338
       338
       +
       

     

       339
       339
       +
       ```json

     

       340
       340
       +
       {

     

       341
       341
       +
         "id": "com.example",

     

       342
       342
       +
         "defs": {

     

       343
       343
       +
           "main": {

     

       344
       344
       +
             "type": "object",

     

       345
       345
       +
             "properties": {

     

       346
       346
       +
               "handle": { "type": "ref", "ref": "#handle" },

     

       347
       347
       +
               "bio": { "type": "ref", "ref": "#bio" }

     

       348
       348
       +
             }

     

       349
       349
       +
           },

     

       350
       350
       +
           "handle": {

     

       351
       351
       +
             "type": "string",

     

       352
       352
       +
             "maxLength": 50

     

       353
       353
       +
           },

     

       354
       354
       +
           "bio": {

     

       355
       355
       +
             "type": "string",

     

       356
       356
       +
             "maxLength": 256,

     

       357
       357
       +
             "maxGraphemes": 128

     

       358
       358
       +
           }

     

       359
       359
       +
         }

     

       360
       360
       +
       }

     

       361
       361
       +
       ```

     

       362
       362
       +
       

     

       363
       363
       +
       Use `@inline` to expand a scalar inline instead:

     

       364
       364
       +
       

     

       365
       365
       +
       ```typescript

     

       366
       366
       +
       import "@typelex/emitter";

     

       367
       367
       +
       

     

       368
       368
       +
       namespace com.example {

     

       369
       369
       +
         model Main {

     

       370
       370
       +
           handle?: Handle;

     

       371
       371
       +
         }

     

       372
       372
       +
       

     

       373
       373
       +
         @inline

     

       374
       374
       +
         @maxLength(50)

     

       375
       375
       +
         scalar Handle extends string;

     

       376
       376
       +
       }

     

       377
       377
       +
       ```

     

       378
       378
       +
       

     

       379
       379
       +
       Now `Handle` is expanded inline (no separate def):

     

       380
       380
       +
       

     

       381
       381
       +
       ```json

     

       382
       382
       +
       // ...

     

       383
       383
       +
       "properties": {

     

       384
       384
       +
         "handle": { "type": "string", "maxLength": 50 }

     

       385
       385
       +
       }

     

       386
       386
       +
       // ...

     

       387
       387
       +
       ```

     

       388
       388
       +
       

     

       315
       389
        
       ## Top-Level Lexicon Types

     

       316
       390
        
       

     

       317
       391
        
       TypeSpec uses `model` for almost everything. Decorators specify what kind of Lexicon type it becomes.

     
···

       905
       979
        
       

     

       906
       980
        
       ## Defaults and Constants

     

       907
       981
        
       

     

       908
       908
       -
       ### Defaults

     

       982
       982
       +
       ### Property Defaults

     

       983
       983
       +
       

     

       984
       984
       +
       You can set default values on properties:

     

       909
       985
        
       

     

       910
       986
        
       ```typescript

     

       911
       987
        
       import "@typelex/emitter";

     
···

       920
       996
        
       

     

       921
       997
        
       Maps to: `{"default": 1}`, `{"default": "en"}`

     

       922
       998
        
       

     

       999
       999
       +
       ### Type Defaults

     

       1000
       1000
       +
       

     

       1001
       1001
       +
       You can also set defaults on scalar and union types using the `@default` decorator:

     

       1002
       1002
       +
       

     

       1003
       1003
       +
       ```typescript

     

       1004
       1004
       +
       import "@typelex/emitter";

     

       1005
       1005
       +
       

     

       1006
       1006
       +
       namespace com.example {

     

       1007
       1007
       +
         model Main {

     

       1008
       1008
       +
           mode?: Mode;

     

       1009
       1009
       +
           priority?: Priority;

     

       1010
       1010
       +
         }

     

       1011
       1011
       +
       

     

       1012
       1012
       +
         @default("standard")

     

       1013
       1013
       +
         scalar Mode extends string;

     

       1014
       1014
       +
       

     

       1015
       1015
       +
         @default(1)

     

       1016
       1016
       +
         @closed

     

       1017
       1017
       +
         @inline

     

       1018
       1018
       +
         union Priority { 1, 2, 3 }

     

       1019
       1019
       +
       }

     

       1020
       1020
       +
       ```

     

       1021
       1021
       +
       

     

       1022
       1022
       +
       This creates a default on the type definition itself:

     

       1023
       1023
       +
       

     

       1024
       1024
       +
       ```json

     

       1025
       1025
       +
       {

     

       1026
       1026
       +
         "defs": {

     

       1027
       1027
       +
           "mode": {

     

       1028
       1028
       +
             "type": "string",

     

       1029
       1029
       +
             "default": "standard"

     

       1030
       1030
       +
           }

     

       1031
       1031
       +
         }

     

       1032
       1032
       +
       }

     

       1033
       1033
       +
       ```

     

       1034
       1034
       +
       

     

       1035
       1035
       +
       For unions with token references, pass the model directly:

     

       1036
       1036
       +
       

     

       1037
       1037
       +
       ```typescript

     

       1038
       1038
       +
       import "@typelex/emitter";

     

       1039
       1039
       +
       

     

       1040
       1040
       +
       namespace com.example {

     

       1041
       1041
       +
         model Main {

     

       1042
       1042
       +
           eventType?: EventType;

     

       1043
       1043
       +
         }

     

       1044
       1044
       +
       

     

       1045
       1045
       +
         @default(InPerson)

     

       1046
       1046
       +
         union EventType { Hybrid, InPerson, Virtual, string }

     

       1047
       1047
       +
       

     

       1048
       1048
       +
         @token model Hybrid {}

     

       1049
       1049
       +
         @token model InPerson {}

     

       1050
       1050
       +
         @token model Virtual {}

     

       1051
       1051
       +
       }

     

       1052
       1052
       +
       ```

     

       1053
       1053
       +
       

     

       1054
       1054
       +
       This resolves to the fully-qualified token NSID:

     

       1055
       1055
       +
       

     

       1056
       1056
       +
       ```json

     

       1057
       1057
       +
       {

     

       1058
       1058
       +
         "eventType": {

     

       1059
       1059
       +
           "type": "string",

     

       1060
       1060
       +
           "knownValues": [

     

       1061
       1061
       +
             "com.example#hybrid",

     

       1062
       1062
       +
             "com.example#inPerson",

     

       1063
       1063
       +
             "com.example#virtual"

     

       1064
       1064
       +
           ],

     

       1065
       1065
       +
           "default": "com.example#inPerson"

     

       1066
       1066
       +
         }

     

       1067
       1067
       +
       }

     

       1068
       1068
       +
       ```

     

       1069
       1069
       +
       

     

       1070
       1070
       +
       **Important:** When a scalar or union creates a standalone def (not `@inline`), property-level defaults must match the type's `@default`. Otherwise you'll get an error:

     

       1071
       1071
       +
       

     

       1072
       1072
       +
       ```typescript

     

       1073
       1073
       +
       @default("standard")

     

       1074
       1074
       +
       scalar Mode extends string;

     

       1075
       1075
       +
       

     

       1076
       1076
       +
       model Main {

     

       1077
       1077
       +
         mode?: Mode = "custom";  // ERROR: Conflicting defaults!

     

       1078
       1078
       +
       }

     

       1079
       1079
       +
       ```

     

       1080
       1080
       +
       

     

       1081
       1081
       +
       Solutions:

     

       1082
       1082
       +
       1. Make the defaults match: `mode?: Mode = "standard"`

     

       1083
       1083
       +
       2. Mark the type `@inline`: Allows property-level defaults

     

       1084
       1084
       +
       3. Remove the property default: Uses the type's default

     

       1085
       1085
       +
       

     

       923
       1086
        
       ### Constants

     

       924
       1087
        
       

     

       925
       1088
        
       Use `@readOnly` with a default:

+125

packages/emitter/test/integration/lexicon-examples/input/community/lexicon/calendar/event.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace community.lexicon.calendar.event {

     

       4
       4
       +
         /** A calendar event. */

     

       5
       5
       +
         @rec("tid")

     

       6
       6
       +
         model Main {

     

       7
       7
       +
           /** The name of the event. */

     

       8
       8
       +
           @required

     

       9
       9
       +
           name: string;

     

       10
       10
       +
       

     

       11
       11
       +
           /** The description of the event. */

     

       12
       12
       +
           description?: string;

     

       13
       13
       +
       

     

       14
       14
       +
           /** Client-declared timestamp when the event was created. */

     

       15
       15
       +
           @required

     

       16
       16
       +
           createdAt: datetime;

     

       17
       17
       +
       

     

       18
       18
       +
           /** Client-declared timestamp when the event starts. */

     

       19
       19
       +
           startsAt?: datetime;

     

       20
       20
       +
       

     

       21
       21
       +
           /** Client-declared timestamp when the event ends. */

     

       22
       22
       +
           endsAt?: datetime;

     

       23
       23
       +
       

     

       24
       24
       +
           /** The attendance mode of the event. */

     

       25
       25
       +
           mode?: Mode;

     

       26
       26
       +
       

     

       27
       27
       +
           /** The status of the event. */

     

       28
       28
       +
           status?: Status;

     

       29
       29
       +
       

     

       30
       30
       +
           /** The locations where the event takes place. */

     

       31
       31
       +
           locations?: (

     

       32
       32
       +
             | Uri

     

       33
       33
       +
             | community.lexicon.location.address.Main

     

       34
       34
       +
             | community.lexicon.location.fsq.Main

     

       35
       35
       +
             | community.lexicon.location.geo.Main

     

       36
       36
       +
             | community.lexicon.location.hthree.Main

     

       37
       37
       +
           )[];

     

       38
       38
       +
       

     

       39
       39
       +
           /** URIs associated with the event. */

     

       40
       40
       +
           uris?: Uri[];

     

       41
       41
       +
         }

     

       42
       42
       +
       

     

       43
       43
       +
         /** The mode of the event. */

     

       44
       44
       +
         @default(Inperson)

     

       45
       45
       +
         union Mode {

     

       46
       46
       +
           Hybrid,

     

       47
       47
       +
           Inperson,

     

       48
       48
       +
           Virtual,

     

       49
       49
       +
           string,

     

       50
       50
       +
         }

     

       51
       51
       +
       

     

       52
       52
       +
         /** A virtual event that takes place online. */

     

       53
       53
       +
         @token

     

       54
       54
       +
         model Virtual {}

     

       55
       55
       +
       

     

       56
       56
       +
         /** An in-person event that takes place offline. */

     

       57
       57
       +
         @token

     

       58
       58
       +
         model Inperson {}

     

       59
       59
       +
       

     

       60
       60
       +
         /** A hybrid event that takes place both online and offline. */

     

       61
       61
       +
         @token

     

       62
       62
       +
         model Hybrid {}

     

       63
       63
       +
       

     

       64
       64
       +
         /** The status of the event. */

     

       65
       65
       +
         @default(Scheduled)

     

       66
       66
       +
         union Status {

     

       67
       67
       +
           Cancelled,

     

       68
       68
       +
           Planned,

     

       69
       69
       +
           Postponed,

     

       70
       70
       +
           Rescheduled,

     

       71
       71
       +
           Scheduled,

     

       72
       72
       +
           string,

     

       73
       73
       +
         }

     

       74
       74
       +
       

     

       75
       75
       +
         /** The event has been created, but not finalized. */

     

       76
       76
       +
         @token

     

       77
       77
       +
         model Planned {}

     

       78
       78
       +
       

     

       79
       79
       +
         /** The event has been created and scheduled. */

     

       80
       80
       +
         @token

     

       81
       81
       +
         model Scheduled {}

     

       82
       82
       +
       

     

       83
       83
       +
         /** The event has been rescheduled. */

     

       84
       84
       +
         @token

     

       85
       85
       +
         model Rescheduled {}

     

       86
       86
       +
       

     

       87
       87
       +
         /** The event has been cancelled. */

     

       88
       88
       +
         @token

     

       89
       89
       +
         model Cancelled {}

     

       90
       90
       +
       

     

       91
       91
       +
         /** The event has been postponed and a new start date has not been set. */

     

       92
       92
       +
         @token

     

       93
       93
       +
         model Postponed {}

     

       94
       94
       +
       

     

       95
       95
       +
         /** A URI associated with the event. */

     

       96
       96
       +
         model Uri {

     

       97
       97
       +
           @required

     

       98
       98
       +
           uri: uri;

     

       99
       99
       +
       

     

       100
       100
       +
           /** The display name of the URI. */

     

       101
       101
       +
           name?: string;

     

       102
       102
       +
         }

     

       103
       103
       +
       }

     

       104
       104
       +
       

     

       105
       105
       +
       // --- Externals ---

     

       106
       106
       +
       

     

       107
       107
       +
       @external

     

       108
       108
       +
       namespace community.lexicon.location.address {

     

       109
       109
       +
         model Main {}

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       @external

     

       113
       113
       +
       namespace community.lexicon.location.fsq {

     

       114
       114
       +
         model Main {}

     

       115
       115
       +
       }

     

       116
       116
       +
       

     

       117
       117
       +
       @external

     

       118
       118
       +
       namespace community.lexicon.location.geo {

     

       119
       119
       +
         model Main {}

     

       120
       120
       +
       }

     

       121
       121
       +
       

     

       122
       122
       +
       @external

     

       123
       123
       +
       namespace community.lexicon.location.hthree {

     

       124
       124
       +
         model Main {}

     

       125
       125
       +
       }

+41

packages/emitter/test/integration/lexicon-examples/input/community/lexicon/calendar/rsvp.tsp

···

       1
       1
       +
       import "@typelex/emitter";

     

       2
       2
       +
       

     

       3
       3
       +
       namespace community.lexicon.calendar.rsvp {

     

       4
       4
       +
         /** An RSVP for an event. */

     

       5
       5
       +
         @rec("tid")

     

       6
       6
       +
         model Main {

     

       7
       7
       +
           @required

     

       8
       8
       +
           subject: `com`.atproto.repo.strongRef.Main;

     

       9
       9
       +
       

     

       10
       10
       +
           @required

     

       11
       11
       +
           status: Status;

     

       12
       12
       +
         }

     

       13
       13
       +
       

     

       14
       14
       +
         @inline

     

       15
       15
       +
         @default(Going)

     

       16
       16
       +
         union Status {

     

       17
       17
       +
           Interested,

     

       18
       18
       +
           Going,

     

       19
       19
       +
           Notgoing,

     

       20
       20
       +
           string,

     

       21
       21
       +
         }

     

       22
       22
       +
       

     

       23
       23
       +
         /** Interested in the event */

     

       24
       24
       +
         @token

     

       25
       25
       +
         model Interested {}

     

       26
       26
       +
       

     

       27
       27
       +
         /** Going to the event */

     

       28
       28
       +
         @token

     

       29
       29
       +
         model Going {}

     

       30
       30
       +
       

     

       31
       31
       +
         /** Not going to the event */

     

       32
       32
       +
         @token

     

       33
       33
       +
         model Notgoing {}

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       // --- Externals ---

     

       37
       37
       +
       

     

       38
       38
       +
       @external

     

       39
       39
       +
       namespace `com`.atproto.repo.strongRef {

     

       40
       40
       +
         model Main {}

     

       41
       41
       +
       }

+119 -1

packages/emitter/test/integration/lexicon-examples/output/community/lexicon/calendar/event.json

···

       2
       2
        
           "lexicon": 1,

     

       3
       3
        
           "id": "community.lexicon.calendar.event",

     

       4
       4
        
           "defs": {

     

       5
       5
       +
               "main": {

     

       6
       6
       +
                   "type": "record",

     

       7
       7
       +
                   "description": "A calendar event.",

     

       8
       8
       +
                   "key": "tid",

     

       9
       9
       +
                   "record": {

     

       10
       10
       +
                       "type": "object",

     

       11
       11
       +
                       "required": [

     

       12
       12
       +
                           "name",

     

       13
       13
       +
                           "createdAt"

     

       14
       14
       +
                       ],

     

       15
       15
       +
                       "properties": {

     

       16
       16
       +
                           "name": {

     

       17
       17
       +
                               "type": "string",

     

       18
       18
       +
                               "description": "The name of the event."

     

       19
       19
       +
                           },

     

       20
       20
       +
                           "description": {

     

       21
       21
       +
                               "type": "string",

     

       22
       22
       +
                               "description": "The description of the event."

     

       23
       23
       +
                           },

     

       24
       24
       +
                           "createdAt": {

     

       25
       25
       +
                               "type": "string",

     

       26
       26
       +
                               "format": "datetime",

     

       27
       27
       +
                               "description": "Client-declared timestamp when the event was created."

     

       28
       28
       +
                           },

     

       29
       29
       +
                           "startsAt": {

     

       30
       30
       +
                               "type": "string",

     

       31
       31
       +
                               "format": "datetime",

     

       32
       32
       +
                               "description": "Client-declared timestamp when the event starts."

     

       33
       33
       +
                           },

     

       34
       34
       +
                           "endsAt": {

     

       35
       35
       +
                               "type": "string",

     

       36
       36
       +
                               "format": "datetime",

     

       37
       37
       +
                               "description": "Client-declared timestamp when the event ends."

     

       38
       38
       +
                           },

     

       39
       39
       +
                           "mode": {

     

       40
       40
       +
                               "type": "ref",

     

       41
       41
       +
                               "ref": "#mode",

     

       42
       42
       +
                               "description": "The attendance mode of the event."

     

       43
       43
       +
                           },

     

       44
       44
       +
                           "status": {

     

       45
       45
       +
                               "type": "ref",

     

       46
       46
       +
                               "ref": "#status",

     

       47
       47
       +
                               "description": "The status of the event."

     

       48
       48
       +
                           },

     

       49
       49
       +
                           "locations": {

     

       50
       50
       +
                               "type": "array",

     

       51
       51
       +
                               "description": "The locations where the event takes place.",

     

       52
       52
       +
                               "items": {

     

       53
       53
       +
                                   "type": "union",

     

       54
       54
       +
                                   "refs": [

     

       55
       55
       +
                                       "#uri",

     

       56
       56
       +
                                       "community.lexicon.location.address",

     

       57
       57
       +
                                       "community.lexicon.location.fsq",

     

       58
       58
       +
                                       "community.lexicon.location.geo",

     

       59
       59
       +
                                       "community.lexicon.location.hthree"

     

       60
       60
       +
                                   ]

     

       61
       61
       +
                               }

     

       62
       62
       +
                           },

     

       63
       63
       +
                           "uris": {

     

       64
       64
       +
                               "type": "array",

     

       65
       65
       +
                               "description": "URIs associated with the event.",

     

       66
       66
       +
                               "items": {

     

       67
       67
       +
                                   "type": "ref",

     

       68
       68
       +
                                   "ref": "#uri"

     

       69
       69
       +
                               }

     

       70
       70
       +
                           }

     

       71
       71
       +
                       }

     

       72
       72
       +
                   }

     

       73
       73
       +
               },

     

       5
       74
        
               "mode": {

     

       6
       75
        
                   "type": "string",

     

       7
       76
        
                   "description": "The mode of the event.",

     
···

       23
       92
        
               "hybrid": {

     

       24
       93
        
                   "type": "token",

     

       25
       94
        
                   "description": "A hybrid event that takes place both online and offline."

     

       95
       95
       +
               },

     

       96
       96
       +
               "status": {

     

       97
       97
       +
                   "type": "string",

     

       98
       98
       +
                   "description": "The status of the event.",

     

       99
       99
       +
                   "default": "community.lexicon.calendar.event#scheduled",

     

       100
       100
       +
                   "knownValues": [

     

       101
       101
       +
                       "community.lexicon.calendar.event#cancelled",

     

       102
       102
       +
                       "community.lexicon.calendar.event#planned",

     

       103
       103
       +
                       "community.lexicon.calendar.event#postponed",

     

       104
       104
       +
                       "community.lexicon.calendar.event#rescheduled",

     

       105
       105
       +
                       "community.lexicon.calendar.event#scheduled"

     

       106
       106
       +
                   ]

     

       107
       107
       +
               },

     

       108
       108
       +
               "planned": {

     

       109
       109
       +
                   "type": "token",

     

       110
       110
       +
                   "description": "The event has been created, but not finalized."

     

       111
       111
       +
               },

     

       112
       112
       +
               "scheduled": {

     

       113
       113
       +
                   "type": "token",

     

       114
       114
       +
                   "description": "The event has been created and scheduled."

     

       115
       115
       +
               },

     

       116
       116
       +
               "rescheduled": {

     

       117
       117
       +
                   "type": "token",

     

       118
       118
       +
                   "description": "The event has been rescheduled."

     

       119
       119
       +
               },

     

       120
       120
       +
               "cancelled": {

     

       121
       121
       +
                   "type": "token",

     

       122
       122
       +
                   "description": "The event has been cancelled."

     

       123
       123
       +
               },

     

       124
       124
       +
               "postponed": {

     

       125
       125
       +
                   "type": "token",

     

       126
       126
       +
                   "description": "The event has been postponed and a new start date has not been set."

     

       127
       127
       +
               },

     

       128
       128
       +
               "uri": {

     

       129
       129
       +
                   "type": "object",

     

       130
       130
       +
                   "description": "A URI associated with the event.",

     

       131
       131
       +
                   "required": [

     

       132
       132
       +
                       "uri"

     

       133
       133
       +
                   ],

     

       134
       134
       +
                   "properties": {

     

       135
       135
       +
                       "uri": {

     

       136
       136
       +
                           "type": "string",

     

       137
       137
       +
                           "format": "uri"

     

       138
       138
       +
                       },

     

       139
       139
       +
                       "name": {

     

       140
       140
       +
                           "type": "string",

     

       141
       141
       +
                           "description": "The display name of the URI."

     

       142
       142
       +
                       }

     

       143
       143
       +
                   }

     

       26
       144
        
               }

     

       27
       145
        
           }

     

       28
       28
       -
       }
     

       146
       146
       +
       }

+1 -1

packages/emitter/test/integration/lexicon-examples/output/community/lexicon/calendar/rsvp.json

···

       42
       42
        
                   "description": "Not going to the event"

     

       43
       43
        
               }

     

       44
       44
        
           }

     

       45
       45
       -
       }
     

       45
       45
       +
       }

+22 -10

packages/emitter/src/emitter.ts

···

       48
       48
        
         LexCidLink,

     

       49
       49
        
         LexRefVariant,

     

       50
       50
        
         LexToken,

     

       51
       51
       +
         LexBoolean,

     

       52
       52
       +
         LexInteger,

     

       53
       53
       +
         LexString,

     

       51
       54
        
       } from "./types.js";

     

       52
       55
        
       

     

       53
       56
        
       import {

     
···

       415
       418
        
             // Apply @default decorator if present

     

       416
       419
        
             const rawDefault = getDefault(this.program, scalar);

     

       417
       420
        
             const defaultValue = this.processDefaultValue(rawDefault);

     

       418
       418
       -
             let defWithDefault: any = { ...scalarDef };

     

       421
       421
       +
             let defWithDefault: LexObjectProperty = { ...scalarDef };

     

       419
       422
        
       

     

       420
       423
        
             if (defaultValue !== undefined) {

     

       421
       424
        
               // Check if it's a Type (model reference for tokens)

     
···

       431
       434
        
               } else {

     

       432
       435
        
                 // Validate that the default value matches the type

     

       433
       436
        
                 this.assertValidValueForType(scalarDef.type, defaultValue, scalar);

     

       434
       434
       -
                 defWithDefault = { ...defWithDefault, default: defaultValue };

     

       437
       437
       +
                 // Type-safe narrowing based on both the type discriminator and value type

     

       438
       438
       +
                 if (scalarDef.type === "boolean" && typeof defaultValue === "boolean") {

     

       439
       439
       +
                   (defWithDefault as LexBoolean).default = defaultValue;

     

       440
       440
       +
                 } else if (scalarDef.type === "integer" && typeof defaultValue === "number") {

     

       441
       441
       +
                   (defWithDefault as LexInteger).default = defaultValue;

     

       442
       442
       +
                 } else if (scalarDef.type === "string" && typeof defaultValue === "string") {

     

       443
       443
       +
                   (defWithDefault as LexString).default = defaultValue;

     

       444
       444
       +
                 }

     

       435
       445
        
               }

     

       436
       446
        
             }

     

       437
       447
        
       

     
···

       439
       449
        
             if (scalarDef.type === "integer") {

     

       440
       450
        
               const minValue = getMinValue(this.program, scalar);

     

       441
       451
        
               if (minValue !== undefined) {

     

       442
       442
       -
                 (defWithDefault as any).minimum = minValue;

     

       452
       452
       +
                 (defWithDefault as LexInteger).minimum = minValue;

     

       443
       453
        
               }

     

       444
       454
        
               const maxValue = getMaxValue(this.program, scalar);

     

       445
       455
        
               if (maxValue !== undefined) {

     

       446
       446
       -
                 (defWithDefault as any).maximum = maxValue;

     

       456
       456
       +
                 (defWithDefault as LexInteger).maximum = maxValue;

     

       447
       457
        
               }

     

       448
       458
        
             }

     

       449
       459
        
       

     
···

       474
       484
        
             // Apply @default decorator if present

     

       475
       485
        
             const rawDefault = getDefault(this.program, union);

     

       476
       486
        
             const defaultValue = this.processDefaultValue(rawDefault);

     

       477
       477
       -
             let defWithDefault: any = { ...unionDef };

     

       487
       487
       +
             let defWithDefault: LexString = { ...unionDef as LexString };

     

       478
       488
        
       

     

       479
       489
        
             if (defaultValue !== undefined) {

     

       480
       490
        
               // Check if it's a Type (model reference for tokens)

     
···

       517
       527
        
                 `Use @inline to inline them at usage sites, use @token models for known values, or use string literals.`,

     

       518
       528
        
               target: union,

     

       519
       529
        
             });

     

       520
       520
       -
           } else if (unionDef.type === "integer" && (unionDef as any).enum) {

     

       530
       530
       +
           } else if (unionDef.type === "integer" && (unionDef as LexInteger).enum) {

     

       521
       531
        
             // Integer enums can also be defs

     

       522
       532
        
             const defName = name.charAt(0).toLowerCase() + name.slice(1);

     

       523
       533
        
             const description = getDoc(this.program, union);

     
···

       525
       535
        
             // Apply @default decorator if present

     

       526
       536
        
             const rawDefault = getDefault(this.program, union);

     

       527
       537
        
             const defaultValue = this.processDefaultValue(rawDefault);

     

       528
       528
       -
             let defWithDefault = { ...unionDef };

     

       538
       538
       +
             let defWithDefault: LexInteger = { ...unionDef as LexInteger };

     

       529
       539
        
       

     

       530
       540
        
             if (defaultValue !== undefined) {

     

       531
       541
        
               if (typeof defaultValue === "number") {

     
···

       645
       655
        
             // Check for default value: property default takes precedence, then union's @default

     

       646
       656
        
             let defaultValue: string | number | boolean | undefined;

     

       647
       657
        
             if (prop?.defaultValue !== undefined) {

     

       648
       648
       -
               defaultValue = serializeValueAsJson(this.program, prop.defaultValue, prop) as any;

     

       658
       658
       +
               defaultValue = serializeValueAsJson(this.program, prop.defaultValue, prop) as string | number | boolean;

     

       649
       659
        
             } else {

     

       650
       660
        
               // If no property default, check union's @default decorator

     

       651
       661
        
               const rawUnionDefault = getDefault(this.program, unionType);

     
···

       681
       691
        
             // Check for default value: property default takes precedence, then union's @default

     

       682
       692
        
             let defaultValue: string | number | boolean | undefined;

     

       683
       693
        
             if (prop?.defaultValue !== undefined) {

     

       684
       684
       -
               defaultValue = serializeValueAsJson(this.program, prop.defaultValue, prop) as any;

     

       694
       694
       +
               defaultValue = serializeValueAsJson(this.program, prop.defaultValue, prop) as string | number | boolean;

     

       685
       695
        
             } else {

     

       686
       696
        
               // If no property default, check union's @default decorator

     

       687
       697
        
               const rawUnionDefault = getDefault(this.program, unionType);

     
···

       1452
       1462
        
                 const propDefault = serializeValueAsJson(this.program, prop.defaultValue, prop);

     

       1453
       1463
        
       

     

       1454
       1464
        
                 // For union defaults that are model references, we need to resolve them for comparison

     

       1455
       1455
       -
                 let resolvedUnionDefault: string | number | boolean | undefined = unionDefault as any;

     

       1465
       1465
       +
                 let resolvedUnionDefault: string | number | boolean | undefined;

     

       1456
       1466
        
                 if (unionDefault && typeof unionDefault === 'object' && 'kind' in unionDefault && unionDefault.kind === 'Model') {

     

       1457
       1467
        
                   const ref = this.getModelReference(unionDefault as Model, true);

     

       1458
       1468
        
                   resolvedUnionDefault = ref || undefined;

     

       1469
       1469
       +
                 } else {

     

       1470
       1470
       +
                   resolvedUnionDefault = unionDefault as string | number | boolean;

     

       1459
       1471
        
                 }

     

       1460
       1472
        
       

     

       1461
       1473
        
                 // If the union has a different default, or if the property has a default but the union doesn't, error