Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sm/strict nulls #465

Merged
merged 18 commits into from
Jan 11, 2023
Merged

Sm/strict nulls #465

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f335c83
refactor: ts strict null checks and linter updates
mshanemc Dec 30, 2022
0582ee5
test: null handling
mshanemc Dec 31, 2022
211a2e7
test: null handling on tests
mshanemc Dec 31, 2022
5c028f9
test: make watchable
mshanemc Dec 31, 2022
95ad92a
test: eslint cleanup and test linting
mshanemc Dec 31, 2022
1776bdf
test: more test null handling
mshanemc Dec 31, 2022
c08a5b5
refactor: ts fighting kit
mshanemc Dec 31, 2022
43b7e6f
chore: schema update from FileResponse exports
mshanemc Dec 31, 2022
9018937
Merge remote-tracking branch 'origin/main' into sm/strict-nulls
mshanemc Dec 31, 2022
95152e9
Merge remote-tracking branch 'origin/main' into sm/strict-nulls
mshanemc Jan 10, 2023
4085ca4
chore: dep bump
mshanemc Jan 10, 2023
463d6ce
chore: bump deps
mshanemc Jan 10, 2023
081fd50
fix: don't default an dependsOn flag
mshanemc Jan 10, 2023
12c222e
refactor: restore default for zip-file-name
mshanemc Jan 10, 2023
f3f5eda
refactor: default in one place
mshanemc Jan 10, 2023
e890a22
refactor: Apply suggestions from code review
mshanemc Jan 11, 2023
f3cfd6a
fix: correct type guard from our ts-types
mshanemc Jan 11, 2023
f5e0a48
Merge branch 'sm/strict-nulls' of https://github.com/salesforcecli/pl…
mshanemc Jan 11, 2023
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
1 change: 1 addition & 0 deletions .mocharc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"require": "ts-node/register,source-map-support/register",
"watch-extensions": "ts",
"watch-files": ["src", "test"],
"recursive": true,
"reporter": "spec",
"timeout": 5000
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^1.16.0",
"@salesforce/core": "^3.32.2",
"@salesforce/kit": "^1.7.0",
"@salesforce/sf-plugins-core": "1.21.0",
"@salesforce/source-deploy-retrieve": "^7.5.22",
"@oclif/core": "^1.23.2",
"@salesforce/core": "^3.32.12",
"@salesforce/kit": "^1.8.2",
"@salesforce/sf-plugins-core": "^1.21.8",
"@salesforce/source-deploy-retrieve": "^7.6.0",
"@salesforce/source-tracking": "^2.2.17",
"chalk": "^4.1.2",
"fs-extra": "^10.0.1",
"shelljs": "^0.8.5",
"tslib": "^2"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^3.2.11",
"@salesforce/cli-plugins-testkit": "^3.2.14",
"@oclif/plugin-command-snapshot": "^3.2.16",
"@salesforce/cli-plugins-testkit": "^3.2.17",
"@salesforce/dev-config": "^3.1.0",
"@salesforce/dev-scripts": "^3.1.0",
"@salesforce/plugin-command-reference": "^2.2.8",
Expand All @@ -35,8 +35,8 @@
"@types/archiver": "^5.3.1",
"@types/fs-extra": "^9.0.13",
"@types/shelljs": "^0.8.11",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.47.0",
"@typescript-eslint/eslint-plugin": "^5.47.1",
"@typescript-eslint/parser": "^5.47.1",
"archiver": "^5.3.1",
"chai": "^4.3.7",
"cross-env": "^7.0.3",
Expand All @@ -48,7 +48,7 @@
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^39.6.2",
"eslint-plugin-sf-plugin": "^0.3.0",
"eslint-plugin-sf-plugin": "^1.3.1",
"husky": "^7.0.4",
"mocha": "^10.1.0",
"nyc": "^15.1.0",
Expand Down
247 changes: 74 additions & 173 deletions schemas/deploy-metadata-cancel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,89 +124,69 @@
"FileResponse": {
"anyOf": [
{
"type": "object",
"properties": {
"fullName": {
"type": "string"
},
"type": {
"type": "string"
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"enum": [
"Created",
"Changed",
"Unchanged",
"Deleted"
]
}
},
"required": [
"fullName",
"state",
"type"
],
"additionalProperties": false
"$ref": "#/definitions/FileResponseSuccess"
},
{
"type": "object",
"properties": {
"fullName": {
"type": "string"
},
"type": {
"type": "string"
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"const": "Failed"
},
"lineNumber": {
"type": "number"
},
"columnNumber": {
"type": "number"
},
"error": {
"type": "string"
},
"problemType": {
"type": "string",
"enum": [
"Warning",
"Error"
]
}
},
"required": [
"error",
"fullName",
"problemType",
"state",
"type"
],
"additionalProperties": false
"$ref": "#/definitions/FileResponseFailure"
}
]
},
"FileResponseSuccess": {
"type": "object",
"properties": {
"fullName": {
"type": "string"
},
"type": {
"type": "string"
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"enum": ["Created", "Changed", "Unchanged", "Deleted"]
}
},
"required": ["fullName", "state", "type"],
"additionalProperties": false
},
"FileResponseFailure": {
"type": "object",
"properties": {
"fullName": {
"type": "string"
},
"type": {
"type": "string"
},
"filePath": {
"type": "string"
},
"state": {
"type": "string",
"const": "Failed"
},
"lineNumber": {
"type": "number"
},
"columnNumber": {
"type": "number"
},
"error": {
"type": "string"
},
"problemType": {
"type": "string",
"enum": ["Warning", "Error"]
}
},
"required": ["error", "fullName", "problemType", "state", "type"],
"additionalProperties": false
},
"RequestStatus": {
"type": "string",
"enum": [
"Pending",
"InProgress",
"Succeeded",
"SucceededPartial",
"Failed",
"Canceling",
"Canceled"
]
"enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"]
},
"DeployDetails": {
"type": "object",
Expand Down Expand Up @@ -247,16 +227,8 @@
"type": "object",
"properties": {
"changed": {
"type": [
"string",
"boolean"
],
"enum": [
"true",
"false",
true,
false
]
"type": ["string", "boolean"],
"enum": ["true", "false", true, false]
},
"columnNumber": {
"type": "string"
Expand All @@ -265,31 +237,15 @@
"type": "string"
},
"created": {
"type": [
"string",
"boolean"
],
"enum": [
"true",
"false",
true,
false
]
"type": ["string", "boolean"],
"enum": ["true", "false", true, false]
},
"createdDate": {
"type": "string"
},
"deleted": {
"type": [
"string",
"boolean"
],
"enum": [
"true",
"false",
true,
false
]
"type": ["string", "boolean"],
"enum": ["true", "false", true, false]
},
"fileName": {
"type": "string"
Expand All @@ -308,33 +264,14 @@
},
"problemType": {
"type": "string",
"enum": [
"Warning",
"Error"
]
"enum": ["Warning", "Error"]
},
"success": {
"type": [
"string",
"boolean"
],
"enum": [
"true",
"false",
true,
false
]
"type": ["string", "boolean"],
"enum": ["true", "false", true, false]
}
},
"required": [
"changed",
"created",
"createdDate",
"deleted",
"fileName",
"fullName",
"success"
],
"required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
"additionalProperties": false
},
"RunTestResult": {
Expand Down Expand Up @@ -402,11 +339,7 @@
"type": "string"
}
},
"required": [
"numFailures",
"numTestsRun",
"totalTime"
],
"required": ["numFailures", "numTestsRun", "totalTime"],
"additionalProperties": false
},
"CodeCoverage": {
Expand Down Expand Up @@ -441,13 +374,7 @@
"type": "string"
}
},
"required": [
"id",
"name",
"numLocations",
"numLocationsNotCovered",
"type"
],
"required": ["id", "name", "numLocations", "numLocationsNotCovered", "type"],
"additionalProperties": false
},
"LocationsNotCovered": {
Expand All @@ -466,12 +393,7 @@
"type": "string"
}
},
"required": [
"column",
"line",
"numExecutions",
"time"
],
"required": ["column", "line", "numExecutions", "time"],
"additionalProperties": false
},
"CodeCoverageWarnings": {
Expand All @@ -487,11 +409,7 @@
"type": "string"
}
},
"required": [
"id",
"message",
"namespace"
],
"required": ["id", "message", "namespace"],
"additionalProperties": false
},
"Failures": {
Expand Down Expand Up @@ -522,16 +440,7 @@
"type": "string"
}
},
"required": [
"id",
"message",
"methodName",
"name",
"packageName",
"stackTrace",
"time",
"type"
],
"required": ["id", "message", "methodName", "name", "packageName", "stackTrace", "time", "type"],
"additionalProperties": false
},
"Successes": {
Expand All @@ -550,12 +459,7 @@
"type": "string"
}
},
"required": [
"id",
"methodName",
"name",
"time"
],
"required": ["id", "methodName", "name", "time"],
"additionalProperties": false
},
"AsyncDeployResultJson": {
Expand Down Expand Up @@ -655,10 +559,7 @@
"type": "boolean"
}
},
"required": [
"files",
"status"
]
"required": ["files", "status"]
}
}
}
}
Loading