Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/powerquery-parser",
"version": "1.0.0",
"version": "2.0.0",
"description": "A parser for the Power Query/M formula language.",
"author": "Microsoft",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/powerquery-parser/language/type/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ export type DefinedTable = IExtendedType &
FieldSpecificationList<OrderedFields> & {
readonly kind: TypeKind.Table;
readonly extendedKind: ExtendedTypeKind.DefinedTable;
readonly rows: ReadonlyArray<UnorderedFields>;
readonly rows?: ReadonlyArray<UnorderedFields>;
};

export type FunctionType = IExtendedType &
Expand Down
9 changes: 5 additions & 4 deletions src/powerquery-parser/language/type/typeUtils/factories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,20 @@ export function definedRecord(
}

/**
* Creates a defined table with exact rows.
* Creates a defined table with known fields and optional exact rows.
*
* Each row is asserted to contain exactly the declared fields and field types compatible with the table definition.
* Omitted rows indicate that the table's rows are unknown, while an empty array represents an exact empty table.
* Each supplied row is asserted to contain exactly the declared fields and field types compatible with the table definition.
* @throws CommonError.InvariantError if a row does not satisfy those requirements.
*/
export function definedTable(
isNullable: boolean,
fields: Type.OrderedFields,
rows: ReadonlyArray<Type.UnorderedFields>,
rows?: ReadonlyArray<Type.UnorderedFields>,
): Type.DefinedTable {
const fieldNames: ReadonlyArray<string> = [...fields.keys()];

for (const [rowIndex, row] of rows.entries()) {
for (const [rowIndex, row] of rows?.entries() ?? []) {
Assert.isTrue(
MapUtils.hasKeys(row, fieldNames) && row.size === fields.size,
`row fields do not match table fields`,
Expand Down
6 changes: 3 additions & 3 deletions src/powerquery-parser/language/type/typeUtils/isEqualType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ export function isEqualDefinedTable(left: Type.DefinedTable, right: Type.Defined
}

function isEqualDefinedTableRows(
left: ReadonlyArray<Type.UnorderedFields>,
right: ReadonlyArray<Type.UnorderedFields>,
left: ReadonlyArray<Type.UnorderedFields> | undefined,
right: ReadonlyArray<Type.UnorderedFields> | undefined,
): boolean {
if (left === right) {
return true;
} else if (left.length !== right.length) {
} else if (left === undefined || right === undefined || left.length !== right.length) {
return false;
}

Expand Down
16 changes: 16 additions & 0 deletions src/test/libraryTest/language/typeUtils/isEqualType.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,21 @@ describe(`TypeUtils.isEqualType`, () => {
expected: false,
});
});

it(`unknown rows equal unknown rows`, () => {
runTest({
left: TypeUtils.definedTable(false, fields),
right: TypeUtils.definedTable(false, fields),
expected: true,
});
});

it(`unknown rows differ from exact empty rows`, () => {
runTest({
left: TypeUtils.definedTable(false, fields),
right: TypeUtils.definedTable(false, fields, []),
expected: false,
});
});
});
});
6 changes: 6 additions & 0 deletions src/test/libraryTest/language/typeUtils/typeUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,12 @@ describe(`TypeUtils`, () => {
expect(type.rows).to.equal(rows);
});

it(`allows unknown rows`, () => {
const type: Type.DefinedTable = TypeUtils.definedTable(false, fields);

expect(type.rows).to.be.undefined;
});

it(`accepts null for a nullable column`, () => {
const nullableFields: Type.OrderedFields = new OrderedMap([["Value", Type.NullableNumberInstance]]);

Expand Down
Loading